diff options
Diffstat (limited to 'client/src/app/modal')
7 files changed, 4 insertions, 32 deletions
diff --git a/client/src/app/modal/account-setup-warning-modal.component.scss b/client/src/app/modal/account-setup-warning-modal.component.scss index d99edaf7a..25e67b08f 100644 --- a/client/src/app/modal/account-setup-warning-modal.component.scss +++ b/client/src/app/modal/account-setup-warning-modal.component.scss | |||
@@ -2,7 +2,6 @@ | |||
2 | @use '_variables' as *; | 2 | @use '_variables' as *; |
3 | 3 | ||
4 | .modal-body { | 4 | .modal-body { |
5 | font-size: 15px; | ||
6 | display: flex; | 5 | display: flex; |
7 | flex-direction: column; | 6 | flex-direction: column; |
8 | align-items: center; | 7 | align-items: center; |
@@ -24,7 +23,6 @@ | |||
24 | .subtitle { | 23 | .subtitle { |
25 | font-weight: $font-semibold; | 24 | font-weight: $font-semibold; |
26 | margin-bottom: 10px; | 25 | margin-bottom: 10px; |
27 | font-size: 16px; | ||
28 | } | 26 | } |
29 | 27 | ||
30 | li { | 28 | li { |
diff --git a/client/src/app/modal/admin-welcome-modal.component.scss b/client/src/app/modal/admin-welcome-modal.component.scss index 242a498d0..716f1fff0 100644 --- a/client/src/app/modal/admin-welcome-modal.component.scss +++ b/client/src/app/modal/admin-welcome-modal.component.scss | |||
@@ -1,10 +1,6 @@ | |||
1 | @use '_mixins' as *; | 1 | @use '_mixins' as *; |
2 | @use '_variables' as *; | 2 | @use '_variables' as *; |
3 | 3 | ||
4 | .modal-body { | ||
5 | font-size: 15px; | ||
6 | } | ||
7 | |||
8 | .two-columns { | 4 | .two-columns { |
9 | display: flex; | 5 | display: flex; |
10 | align-items: center; | 6 | align-items: center; |
@@ -26,7 +22,6 @@ | |||
26 | .subtitle { | 22 | .subtitle { |
27 | font-weight: $font-semibold; | 23 | font-weight: $font-semibold; |
28 | margin-bottom: 10px; | 24 | margin-bottom: 10px; |
29 | font-size: 16px; | ||
30 | } | 25 | } |
31 | 26 | ||
32 | .block-documentation { | 27 | .block-documentation { |
@@ -63,7 +58,6 @@ li { | |||
63 | } | 58 | } |
64 | 59 | ||
65 | .link-title { | 60 | .link-title { |
66 | font-size: 16px; | ||
67 | font-weight: $font-semibold; | 61 | font-weight: $font-semibold; |
68 | display: flex; | 62 | display: flex; |
69 | justify-content: center; | 63 | justify-content: center; |
diff --git a/client/src/app/modal/confirm.component.html b/client/src/app/modal/confirm.component.html index f07501726..c59c25770 100644 --- a/client/src/app/modal/confirm.component.html +++ b/client/src/app/modal/confirm.component.html | |||
@@ -9,7 +9,7 @@ | |||
9 | <div class="modal-body" > | 9 | <div class="modal-body" > |
10 | <div [innerHtml]="message"></div> | 10 | <div [innerHtml]="message"></div> |
11 | 11 | ||
12 | <div *ngIf="inputLabel && expectedInputValue" class="form-group"> | 12 | <div *ngIf="inputLabel && expectedInputValue" class="form-group mt-3"> |
13 | <label for="confirmInput">{{ inputLabel }}</label> | 13 | <label for="confirmInput">{{ inputLabel }}</label> |
14 | <input type="text" id="confirmInput" name="confirmInput" [(ngModel)]="inputValue" /> | 14 | <input type="text" id="confirmInput" name="confirmInput" [(ngModel)]="inputValue" /> |
15 | </div> | 15 | </div> |
diff --git a/client/src/app/modal/confirm.component.scss b/client/src/app/modal/confirm.component.scss index 77ea4d307..3372baf1a 100644 --- a/client/src/app/modal/confirm.component.scss +++ b/client/src/app/modal/confirm.component.scss | |||
@@ -1,10 +1,6 @@ | |||
1 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | .modal-body { | ||
5 | font-size: 15px; | ||
6 | } | ||
7 | |||
8 | .button { | 4 | .button { |
9 | padding: 0 13px; | 5 | padding: 0 13px; |
10 | } | 6 | } |
@@ -13,7 +9,3 @@ input[type=text] { | |||
13 | @include peertube-input-text(100%); | 9 | @include peertube-input-text(100%); |
14 | display: block; | 10 | display: block; |
15 | } | 11 | } |
16 | |||
17 | .form-group { | ||
18 | margin: 20px 0; | ||
19 | } | ||
diff --git a/client/src/app/modal/custom-modal.component.scss b/client/src/app/modal/custom-modal.component.scss index 15cbadfc0..c5b77994e 100644 --- a/client/src/app/modal/custom-modal.component.scss +++ b/client/src/app/modal/custom-modal.component.scss | |||
@@ -1,10 +1,6 @@ | |||
1 | @use '_mixins' as *; | 1 | @use '_mixins' as *; |
2 | @use '_variables' as *; | 2 | @use '_variables' as *; |
3 | 3 | ||
4 | .modal-body { | ||
5 | font-size: 15px; | ||
6 | } | ||
7 | |||
8 | li { | 4 | li { |
9 | margin-bottom: 10px; | 5 | margin-bottom: 10px; |
10 | } | 6 | } |
diff --git a/client/src/app/modal/instance-config-warning-modal.component.scss b/client/src/app/modal/instance-config-warning-modal.component.scss index 3e6c6d716..b650f4e69 100644 --- a/client/src/app/modal/instance-config-warning-modal.component.scss +++ b/client/src/app/modal/instance-config-warning-modal.component.scss | |||
@@ -1,10 +1,6 @@ | |||
1 | @use '_mixins' as *; | 1 | @use '_mixins' as *; |
2 | @use '_variables' as *; | 2 | @use '_variables' as *; |
3 | 3 | ||
4 | .modal-body { | ||
5 | font-size: 15px; | ||
6 | } | ||
7 | |||
8 | li { | 4 | li { |
9 | margin-bottom: 10px; | 5 | margin-bottom: 10px; |
10 | } | 6 | } |
diff --git a/client/src/app/modal/quick-settings-modal.component.html b/client/src/app/modal/quick-settings-modal.component.html index 8fa3aee50..5c55ee028 100644 --- a/client/src/app/modal/quick-settings-modal.component.html +++ b/client/src/app/modal/quick-settings-modal.component.html | |||
@@ -5,21 +5,17 @@ | |||
5 | </div> | 5 | </div> |
6 | 6 | ||
7 | <div class="modal-body"> | 7 | <div class="modal-body"> |
8 | <div i18n class="mb-4 font-italic">These settings apply only to your session on this instance.</div> | 8 | <div i18n class="alert pt-alert-primary">These settings apply only to your session on this instance.</div> |
9 | 9 | ||
10 | <h6 i18n class="mb-4">Display settings</h6> | 10 | <h5 i18n class="mt-4 mb-2">Videos</h5> |
11 | 11 | ||
12 | <my-user-video-settings | 12 | <my-user-video-settings |
13 | *ngIf="!isUserLoggedIn()" | 13 | *ngIf="!isUserLoggedIn()" |
14 | [user]="user" [userInformationLoaded]="userInformationLoaded" [reactiveUpdate]="true" [notifyOnUpdate]="true" | 14 | [user]="user" [userInformationLoaded]="userInformationLoaded" [reactiveUpdate]="true" [notifyOnUpdate]="true" |
15 | > | 15 | > |
16 | |||
17 | <ng-container ngProjectAs="inner-title"> | ||
18 | <h6 i18n class="mb-4 mt-4">Video settings</h6> | ||
19 | </ng-container> | ||
20 | </my-user-video-settings> | 16 | </my-user-video-settings> |
21 | 17 | ||
22 | <h6 i18n class="mb-4 mt-4">Interface settings</h6> | 18 | <h5 i18n class="mt-4 mb-2">Interface</h5> |
23 | 19 | ||
24 | <my-user-interface-settings | 20 | <my-user-interface-settings |
25 | *ngIf="!isUserLoggedIn()" | 21 | *ngIf="!isUserLoggedIn()" |