<h1 class="visually-hidden" i18n>Notifications</h1>
+
<div class="header">
- <a routerLink="/my-account/settings" fragment="notifications" i18n>
+ <a class="peertube-button-link grey-button" routerLink="/my-account/settings" fragment="notifications">
<my-global-icon iconName="cog" aria-hidden="true"></my-global-icon>
- Notification preferences
+ <span i18n>Notification preferences</span>
</a>
<div class="peertube-select-container peertube-select-button ms-2 me-2">
</select>
</div>
- <button class="btn ms-auto" [disabled]="!hasUnreadNotifications()" (click)="markAllAsRead()">
+ <button class="ms-auto peertube-button grey-button" [disabled]="!hasUnreadNotifications()" (click)="markAllAsRead()">
<ng-container *ngIf="hasUnreadNotifications()">
<my-global-icon iconName="tick" aria-hidden="true"></my-global-icon>
.header {
display: flex;
- margin-bottom: 20px;
+ margin-bottom: 1.25rem;
a {
- @include peertube-button-link;
- @include grey-button;
@include button-with-icon(18px, 3px, -1px);
}
button {
- @include peertube-button;
- @include grey-button;
@include button-with-icon(20px, 3px, -1px);
}
<my-search-typeahead class="w-100 d-flex justify-content-center"></my-search-typeahead>
-<a class="publish-button" routerLink="/videos/upload">
+<a class="peertube-button-link orange-button publish-button" routerLink="/videos/upload">
<my-global-icon iconName="upload" aria-hidden="true"></my-global-icon>
<span i18n class="publish-button-label">Publish</span>
</a>
@use '_mixins' as *;
.publish-button {
- @include peertube-button-link;
- @include orange-button;
- @include button-with-icon(22px, 3px, -1px);
+ @include button-with-icon(21px, 3px, -1px);
@include margin-right(25px);
@media screen and (max-width: $mobile-view) {
@use '_mixins' as *;
#search-video {
- @include peertube-input-text($search-input-width);
+ @include peertube-input-text($search-input-width, 14px);
@include padding-left(10px);
@include padding-right(40px); // For the search icon
- font-size: 14px;
-
&::placeholder {
color: pvar(--inputPlaceholderColor);
}
}
}
-@mixin peertube-input-text($width) {
- padding: 4px 15px;
+@mixin rounded-line-height-1-5 ($font-size) {
+ line-height: $font-size + math.round(math.div($font-size, 2));
+}
+
+@mixin peertube-input-text($width, $font-size: $form-input-font-size) {
+ @include rounded-line-height-1-5($font-size);
+
+ font-size: $font-size;
+
+ padding: 3px 15px;
display: inline-block;
width: $width;
max-width: $width;
background-color: pvar(--inputBackgroundColor);
border: 1px solid pvar(--inputBorderColor);
border-radius: 3px;
- font-size: $form-input-font-size;
- line-height: $form-input-line-height;
&::placeholder {
color: pvar(--inputPlaceholderColor);
}
@mixin peertube-button {
+ @include rounded-line-height-1-5($button-font-size);
+
padding: 4px 13px;
border: 0;
cursor: pointer;
font-size: $button-font-size;
- line-height: $button-font-size + math.round(math.div($button-font-size, 2));
my-global-icon + * {
@include margin-right(4px);
width: $width;
top: $top;
}
-
- span {
- vertical-align: middle;
- }
}
@mixin peertube-file {
}
select {
- padding: 4px 35px 4px 12px;
+ @include rounded-line-height-1-5($form-input-font-size);
+
+ font-size: $form-input-font-size;
+
+ padding: 3px 35px 3px 12px;
position: relative;
border: 1px solid pvar(--inputBorderColor);
background: transparent none;
appearance: none;
text-overflow: ellipsis;
color: pvar(--mainForegroundColor);
- font-size: $form-input-font-size;
- line-height: $form-input-line-height;
&:focus {
outline: none;
font-weight: $font-semibold;
color: pvar(--greyForegroundColor);
border: 0;
+
+ // No border, add +1 to vertical padding
+ padding: 4px 35px 4px 12px;
}
}
}
$focus-box-shadow-form: 0 0 0 .2rem;
$form-input-font-size: 15px;
-$form-input-line-height: 1.4;
$video-watch-player-factor: math.div(16, 9);
$video-watch-info-margin-left: 44px;
@import '@ng-select/ng-select/scss/default.theme';
.ng-select {
+ @include rounded-line-height-1-5($ng-select-value-font-size);
+
font-size: $ng-select-value-font-size;
- line-height: $form-input-line-height;
&.ng-select-focused {
&:not(.ng-select-opened) > .ng-select-container {