diff options
author | Chocobozzz <me@florianbigard.com> | 2022-06-15 14:59:25 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-06-16 11:37:08 +0200 |
commit | 5b0ec7cddb1ae6dbd2057f067382866f846b882c (patch) | |
tree | 5751d96ec4ab0d49b793c4ff1c8edbc8daeab6ac /client/src/app/+my-account | |
parent | b13a0a48bacb53e65e665774e621326452045294 (diff) | |
download | PeerTube-5b0ec7cddb1ae6dbd2057f067382866f846b882c.tar.gz PeerTube-5b0ec7cddb1ae6dbd2057f067382866f846b882c.tar.zst PeerTube-5b0ec7cddb1ae6dbd2057f067382866f846b882c.zip |
Increase global font size
Diffstat (limited to 'client/src/app/+my-account')
10 files changed, 19 insertions, 46 deletions
diff --git a/client/src/app/+my-account/my-account-applications/my-account-applications.component.scss b/client/src/app/+my-account/my-account-applications/my-account-applications.component.scss index 2a3b85c22..b3fedd2f6 100644 --- a/client/src/app/+my-account/my-account-applications/my-account-applications.component.scss +++ b/client/src/app/+my-account/my-account-applications/my-account-applications.component.scss | |||
@@ -1,11 +1,6 @@ | |||
1 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | label { | ||
5 | font-weight: $font-regular; | ||
6 | font-size: 100%; | ||
7 | } | ||
8 | |||
9 | .applications-title { | 4 | .applications-title { |
10 | @include settings-big-title; | 5 | @include settings-big-title; |
11 | } | 6 | } |
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss index b0ac45e30..d412e568f 100644 --- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss +++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | .header { | 4 | .header { |
5 | display: flex; | 5 | display: flex; |
6 | font-size: 15px; | ||
7 | margin-bottom: 20px; | 6 | margin-bottom: 20px; |
8 | 7 | ||
9 | a { | 8 | a { |
@@ -23,11 +22,6 @@ | |||
23 | } | 22 | } |
24 | } | 23 | } |
25 | 24 | ||
26 | |||
27 | my-user-notifications { | ||
28 | font-size: 15px; | ||
29 | } | ||
30 | |||
31 | @media screen and (max-width: $mobile-view) { | 25 | @media screen and (max-width: $mobile-view) { |
32 | .header { | 26 | .header { |
33 | flex-direction: column; | 27 | flex-direction: column; |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html index b0a9dbb38..c9f9d8f55 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html | |||
@@ -1,18 +1,20 @@ | |||
1 | <div *ngIf="error" class="alert alert-danger">{{ error }}</div> | 1 | <div *ngIf="error" class="alert alert-danger">{{ error }}</div> |
2 | <div *ngIf="success" class="alert alert-success">{{ success }}</div> | 2 | <div *ngIf="success" class="alert alert-success">{{ success }}</div> |
3 | 3 | ||
4 | <div i18n class="current-email"> | ||
5 | Your current email is <span class="email">{{ user.email }}</span>. | ||
6 | It is never shown to the public. | ||
7 | </div> | ||
8 | |||
9 | <div i18n class="pending-email" *ngIf="user.pendingEmail"> | 4 | <div i18n class="pending-email" *ngIf="user.pendingEmail"> |
10 | <span class="email">{{ user.pendingEmail }}</span> is awaiting email verification | 5 | <strong>{{ user.pendingEmail }}</strong> is awaiting email verification |
11 | </div> | 6 | </div> |
12 | 7 | ||
13 | <form role="form" class="change-email" (ngSubmit)="changeEmail()" [formGroup]="form" *ngIf="user.pluginAuth === null"> | 8 | <form role="form" class="change-email" (ngSubmit)="changeEmail()" [formGroup]="form" *ngIf="user.pluginAuth === null"> |
14 | 9 | ||
15 | <div class="form-group"> | 10 | <div class="form-group"> |
11 | <label i18n for="new-email">Change your email</label> | ||
12 | |||
13 | <div i18n class="form-group-description"> | ||
14 | Your current email is <strong>{{ user.email }}</strong>. | ||
15 | It is never shown to the public. | ||
16 | </div> | ||
17 | |||
16 | <input | 18 | <input |
17 | type="email" id="new-email" i18n-placeholder placeholder="New email" class="form-control" | 19 | type="email" id="new-email" i18n-placeholder placeholder="New email" class="form-control" |
18 | formControlName="new-email" [ngClass]="{ 'input-error': formErrors['new-email'] }" | 20 | formControlName="new-email" [ngClass]="{ 'input-error': formErrors['new-email'] }" |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss index 9be9056b8..8d1804a93 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss +++ b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss | |||
@@ -1,18 +1,17 @@ | |||
1 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | label { | 4 | form { |
5 | font-weight: $font-regular; | 5 | max-width: 340px; |
6 | font-size: 100%; | ||
7 | } | 6 | } |
8 | 7 | ||
9 | my-input-text { | 8 | my-input-text { |
10 | width: 340px; | ||
11 | display: block; | 9 | display: block; |
10 | width: 100%; | ||
12 | } | 11 | } |
13 | 12 | ||
14 | input[type=email] { | 13 | input[type=email] { |
15 | @include peertube-input-text(340px); | 14 | @include peertube-input-text(100%); |
16 | 15 | ||
17 | display: block; | 16 | display: block; |
18 | } | 17 | } |
@@ -22,15 +21,6 @@ input[type=submit] { | |||
22 | @include orange-button; | 21 | @include orange-button; |
23 | } | 22 | } |
24 | 23 | ||
25 | .current-email, | ||
26 | .pending-email { | 24 | .pending-email { |
27 | margin-bottom: 15px; | 25 | margin-bottom: 15px; |
28 | |||
29 | .email { | ||
30 | font-weight: $font-semibold; | ||
31 | } | ||
32 | } | ||
33 | |||
34 | .form-group { | ||
35 | width: max-content; | ||
36 | } | 26 | } |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss index ab6a43b57..a29f04c36 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss +++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss | |||
@@ -1,14 +1,13 @@ | |||
1 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | label { | 4 | form { |
5 | font-weight: $font-regular; | 5 | max-width: 340px; |
6 | font-size: 100%; | ||
7 | } | 6 | } |
8 | 7 | ||
9 | my-input-text { | 8 | my-input-text { |
10 | width: 340px; | ||
11 | display: block; | 9 | display: block; |
10 | width: 100%; | ||
12 | } | 11 | } |
13 | 12 | ||
14 | my-input-text + my-input-text { | 13 | my-input-text + my-input-text { |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html index c3cfe0314..46f5e5d6b 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html | |||
@@ -1,13 +1,13 @@ | |||
1 | <div *ngIf="webNotifications"> | 1 | <div *ngIf="webNotifications"> |
2 | <ng-container *ngFor="let group of notificationSettingGroups"> | 2 | <ng-container *ngFor="let group of notificationSettingGroups"> |
3 | <div class="header custom-row"> | 3 | <div class="header notification-row"> |
4 | <div i18n>{{ group.label }}</div> | 4 | <div i18n>{{ group.label }}</div> |
5 | <div i18n>Web</div> | 5 | <div i18n>Web</div> |
6 | <div i18n *ngIf="emailEnabled">Email</div> | 6 | <div i18n *ngIf="emailEnabled">Email</div> |
7 | </div> | 7 | </div> |
8 | 8 | ||
9 | <ng-container *ngFor="let notificationType of group.keys"> | 9 | <ng-container *ngFor="let notificationType of group.keys"> |
10 | <div class="custom-row" *ngIf="hasUserRight(notificationType)"> | 10 | <div class="small notification-row" *ngIf="hasUserRight(notificationType)"> |
11 | <div>{{ labelNotifications[notificationType] }}</div> | 11 | <div>{{ labelNotifications[notificationType] }}</div> |
12 | 12 | ||
13 | <div> | 13 | <div> |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss index 2fe1f9536..8181c3175 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss +++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss | |||
@@ -1,13 +1,12 @@ | |||
1 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | .custom-row { | 4 | .notification-row { |
5 | display: flex; | 5 | display: flex; |
6 | align-items: center; | 6 | align-items: center; |
7 | border-bottom: 1px solid $separator-border-color; | 7 | border-bottom: 1px solid $separator-border-color; |
8 | 8 | ||
9 | &.header { | 9 | &.header { |
10 | font-size: 16px; | ||
11 | font-weight: $font-semibold; | 10 | font-weight: $font-semibold; |
12 | margin-top: 10px; | 11 | margin-top: 10px; |
13 | } | 12 | } |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html index ae5f25cff..2b192ab6d 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html | |||
@@ -8,7 +8,7 @@ | |||
8 | type="text" id="username" class="form-control" | 8 | type="text" id="username" class="form-control" |
9 | formControlName="username" readonly | 9 | formControlName="username" readonly |
10 | > | 10 | > |
11 | <div class="muted" i18n> | 11 | <div class="form-group-description" i18n> |
12 | People can find you using @{{ user.username }}@{{ instanceHost }} | 12 | People can find you using @{{ user.username }}@{{ instanceHost }} |
13 | </div> | 13 | </div> |
14 | </div> | 14 | </div> |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss index 78f7ef1d5..23e701332 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss +++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss | |||
@@ -1,11 +1,6 @@ | |||
1 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | label { | ||
5 | font-weight: $font-regular; | ||
6 | font-size: 100%; | ||
7 | } | ||
8 | |||
9 | input#username + .muted { | 4 | input#username + .muted { |
10 | margin-top: 5px; | 5 | margin-top: 5px; |
11 | } | 6 | } |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html index abcfe54a6..d9e833019 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html | |||
@@ -14,7 +14,6 @@ | |||
14 | </div> | 14 | </div> |
15 | 15 | ||
16 | <div class="col-12 col-lg-8 col-xl-9"> | 16 | <div class="col-12 col-lg-8 col-xl-9"> |
17 | |||
18 | <my-user-quota [user]="user" [userInformationLoaded]="userInformationLoaded"></my-user-quota> | 17 | <my-user-quota [user]="user" [userInformationLoaded]="userInformationLoaded"></my-user-quota> |
19 | 18 | ||
20 | <my-account-profile [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-profile> | 19 | <my-account-profile [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-profile> |