diff options
Diffstat (limited to 'client/src/app')
5 files changed, 8 insertions, 15 deletions
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html index b98cd1156..e3b226768 100644 --- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html +++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html | |||
@@ -1,8 +1,9 @@ | |||
1 | <h1 class="visually-hidden" i18n>Notifications</h1> | 1 | <h1 class="visually-hidden" i18n>Notifications</h1> |
2 | |||
2 | <div class="header"> | 3 | <div class="header"> |
3 | <a routerLink="/my-account/settings" fragment="notifications" i18n> | 4 | <a class="peertube-button-link grey-button" routerLink="/my-account/settings" fragment="notifications"> |
4 | <my-global-icon iconName="cog" aria-hidden="true"></my-global-icon> | 5 | <my-global-icon iconName="cog" aria-hidden="true"></my-global-icon> |
5 | Notification preferences | 6 | <span i18n>Notification preferences</span> |
6 | </a> | 7 | </a> |
7 | 8 | ||
8 | <div class="peertube-select-container peertube-select-button ms-2 me-2"> | 9 | <div class="peertube-select-container peertube-select-button ms-2 me-2"> |
@@ -13,7 +14,7 @@ | |||
13 | </select> | 14 | </select> |
14 | </div> | 15 | </div> |
15 | 16 | ||
16 | <button class="btn ms-auto" [disabled]="!hasUnreadNotifications()" (click)="markAllAsRead()"> | 17 | <button class="ms-auto peertube-button grey-button" [disabled]="!hasUnreadNotifications()" (click)="markAllAsRead()"> |
17 | <ng-container *ngIf="hasUnreadNotifications()"> | 18 | <ng-container *ngIf="hasUnreadNotifications()"> |
18 | <my-global-icon iconName="tick" aria-hidden="true"></my-global-icon> | 19 | <my-global-icon iconName="tick" aria-hidden="true"></my-global-icon> |
19 | 20 | ||
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 d412e568f..cee338991 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,17 +3,13 @@ | |||
3 | 3 | ||
4 | .header { | 4 | .header { |
5 | display: flex; | 5 | display: flex; |
6 | margin-bottom: 20px; | 6 | margin-bottom: 1.25rem; |
7 | 7 | ||
8 | a { | 8 | a { |
9 | @include peertube-button-link; | ||
10 | @include grey-button; | ||
11 | @include button-with-icon(18px, 3px, -1px); | 9 | @include button-with-icon(18px, 3px, -1px); |
12 | } | 10 | } |
13 | 11 | ||
14 | button { | 12 | button { |
15 | @include peertube-button; | ||
16 | @include grey-button; | ||
17 | @include button-with-icon(20px, 3px, -1px); | 13 | @include button-with-icon(20px, 3px, -1px); |
18 | } | 14 | } |
19 | 15 | ||
diff --git a/client/src/app/header/header.component.html b/client/src/app/header/header.component.html index b5e9e3dd8..4e327769d 100644 --- a/client/src/app/header/header.component.html +++ b/client/src/app/header/header.component.html | |||
@@ -1,6 +1,6 @@ | |||
1 | <my-search-typeahead class="w-100 d-flex justify-content-center"></my-search-typeahead> | 1 | <my-search-typeahead class="w-100 d-flex justify-content-center"></my-search-typeahead> |
2 | 2 | ||
3 | <a class="publish-button" routerLink="/videos/upload"> | 3 | <a class="peertube-button-link orange-button publish-button" routerLink="/videos/upload"> |
4 | <my-global-icon iconName="upload" aria-hidden="true"></my-global-icon> | 4 | <my-global-icon iconName="upload" aria-hidden="true"></my-global-icon> |
5 | <span i18n class="publish-button-label">Publish</span> | 5 | <span i18n class="publish-button-label">Publish</span> |
6 | </a> | 6 | </a> |
diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss index ef7749ced..37bee4645 100644 --- a/client/src/app/header/header.component.scss +++ b/client/src/app/header/header.component.scss | |||
@@ -2,9 +2,7 @@ | |||
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | .publish-button { | 4 | .publish-button { |
5 | @include peertube-button-link; | 5 | @include button-with-icon(21px, 3px, -1px); |
6 | @include orange-button; | ||
7 | @include button-with-icon(22px, 3px, -1px); | ||
8 | @include margin-right(25px); | 6 | @include margin-right(25px); |
9 | 7 | ||
10 | @media screen and (max-width: $mobile-view) { | 8 | @media screen and (max-width: $mobile-view) { |
diff --git a/client/src/app/header/search-typeahead.component.scss b/client/src/app/header/search-typeahead.component.scss index 48b61cf3f..b96853400 100644 --- a/client/src/app/header/search-typeahead.component.scss +++ b/client/src/app/header/search-typeahead.component.scss | |||
@@ -2,13 +2,11 @@ | |||
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | #search-video { | 4 | #search-video { |
5 | @include peertube-input-text($search-input-width); | 5 | @include peertube-input-text($search-input-width, 14px); |
6 | 6 | ||
7 | @include padding-left(10px); | 7 | @include padding-left(10px); |
8 | @include padding-right(40px); // For the search icon | 8 | @include padding-right(40px); // For the search icon |
9 | 9 | ||
10 | font-size: 14px; | ||
11 | |||
12 | &::placeholder { | 10 | &::placeholder { |
13 | color: pvar(--inputPlaceholderColor); | 11 | color: pvar(--inputPlaceholderColor); |
14 | } | 12 | } |