diff options
Diffstat (limited to 'client/src/app')
8 files changed, 11 insertions, 19 deletions
diff --git a/client/src/app/+about/about-follows/about-follows.component.html b/client/src/app/+about/about-follows/about-follows.component.html index 84626809d..fd4109416 100644 --- a/client/src/app/+about/about-follows/about-follows.component.html +++ b/client/src/app/+about/about-follows/about-follows.component.html | |||
@@ -2,7 +2,7 @@ | |||
2 | <h1 class="visually-hidden" i18n>Follows</h1> | 2 | <h1 class="visually-hidden" i18n>Follows</h1> |
3 | 3 | ||
4 | <div class="col-xl-6 col-md-12"> | 4 | <div class="col-xl-6 col-md-12"> |
5 | <h2 i18n class="pt-fs-5-5 mb-4 fw-semibold">Followers of {{ instanceName }} ({{ followersPagination.totalItems }})</h2> | 5 | <h2 i18n class="fs-5-5 mb-4 fw-semibold">Followers of {{ instanceName }} ({{ followersPagination.totalItems }})</h2> |
6 | 6 | ||
7 | <div i18n class="no-results" *ngIf="followersPagination.totalItems === 0">{{ instanceName }} does not have followers.</div> | 7 | <div i18n class="no-results" *ngIf="followersPagination.totalItems === 0">{{ instanceName }} does not have followers.</div> |
8 | 8 | ||
@@ -14,7 +14,7 @@ | |||
14 | </div> | 14 | </div> |
15 | 15 | ||
16 | <div class="col-xl-6 col-md-12"> | 16 | <div class="col-xl-6 col-md-12"> |
17 | <h2 i18n class="pt-fs-5-5 mb-4 fw-semibold">Subscriptions of {{ instanceName }} ({{ followingsPagination.totalItems }})</h2> | 17 | <h2 i18n class="fs-5-5 mb-4 fw-semibold">Subscriptions of {{ instanceName }} ({{ followingsPagination.totalItems }})</h2> |
18 | 18 | ||
19 | <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">{{ instanceName }} does not have subscriptions.</div> | 19 | <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">{{ instanceName }} does not have subscriptions.</div> |
20 | 20 | ||
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.scss b/client/src/app/+about/about-peertube/about-peertube.component.scss index 001405dc7..a81bb8cfc 100644 --- a/client/src/app/+about/about-peertube/about-peertube.component.scss +++ b/client/src/app/+about/about-peertube/about-peertube.component.scss | |||
@@ -7,7 +7,7 @@ | |||
7 | } | 7 | } |
8 | 8 | ||
9 | .card { | 9 | .card { |
10 | @include rfs(2rem, margin); | 10 | @include margin(2rem); |
11 | 11 | ||
12 | flex-basis: 300px; | 12 | flex-basis: 300px; |
13 | } | 13 | } |
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss index 2e34ed71c..b5aacffc8 100644 --- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss +++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss | |||
@@ -8,8 +8,8 @@ | |||
8 | } | 8 | } |
9 | 9 | ||
10 | .channel { | 10 | .channel { |
11 | @include rfs(2rem, padding); | 11 | @include padding(1.75rem); |
12 | @include rfs(2rem 0, margin); | 12 | @include margin(2rem, 0); |
13 | 13 | ||
14 | max-width: $max-channels-width; | 14 | max-width: $max-channels-width; |
15 | background-color: pvar(--channelBackgroundColor); | 15 | background-color: pvar(--channelBackgroundColor); |
@@ -110,10 +110,6 @@ my-subscribe-button { | |||
110 | } | 110 | } |
111 | 111 | ||
112 | @include on-small-main-col { | 112 | @include on-small-main-col { |
113 | .channel { | ||
114 | padding: 15px; | ||
115 | } | ||
116 | |||
117 | .channel-avatar-row { | 113 | .channel-avatar-row { |
118 | grid-template-columns: auto auto auto 1fr; | 114 | grid-template-columns: auto auto auto 1fr; |
119 | 115 | ||
diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html index 116b26a4d..2a4985964 100644 --- a/client/src/app/+accounts/accounts.component.html +++ b/client/src/app/+accounts/accounts.component.html | |||
@@ -13,7 +13,7 @@ | |||
13 | <h1 i18n-title [title]="'Created on ' + (account.createdAt | date)">{{ account.displayName }}</h1> | 13 | <h1 i18n-title [title]="'Created on ' + (account.createdAt | date)">{{ account.displayName }}</h1> |
14 | 14 | ||
15 | <my-user-moderation-dropdown | 15 | <my-user-moderation-dropdown |
16 | class="mx-3" prependActions]="prependModerationActions" | 16 | class="mx-3" [prependActions]="prependModerationActions" |
17 | buttonSize="small" [account]="account" [user]="accountUser" placement="bottom-left auto" | 17 | buttonSize="small" [account]="account" [user]="accountUser" placement="bottom-left auto" |
18 | (userChanged)="onUserChanged()" (userDeleted)="onUserDeleted()" | 18 | (userChanged)="onUserChanged()" (userDeleted)="onUserDeleted()" |
19 | ></my-user-moderation-dropdown> | 19 | ></my-user-moderation-dropdown> |
diff --git a/client/src/app/+accounts/accounts.component.scss b/client/src/app/+accounts/accounts.component.scss index 908e4eeda..56b952b65 100644 --- a/client/src/app/+accounts/accounts.component.scss +++ b/client/src/app/+accounts/accounts.component.scss | |||
@@ -109,8 +109,8 @@ | |||
109 | 109 | ||
110 | @media screen and (max-width: $mobile-view) { | 110 | @media screen and (max-width: $mobile-view) { |
111 | .root { | 111 | .root { |
112 | --myFontSize: $font-size-rem-14px; | 112 | --myFontSize: 14px; |
113 | --myGreyFontSize: $font-size-rem-13px; | 113 | --myGreyFontSize: 13px; |
114 | } | 114 | } |
115 | 115 | ||
116 | .links { | 116 | .links { |
diff --git a/client/src/app/+home/home.component.ts b/client/src/app/+home/home.component.ts index 8da4a2008..e59cde989 100644 --- a/client/src/app/+home/home.component.ts +++ b/client/src/app/+home/home.component.ts | |||
@@ -2,7 +2,7 @@ import { Component, ElementRef, OnInit, ViewChild } from '@angular/core' | |||
2 | import { CustomPageService } from '@app/shared/shared-main/custom-page' | 2 | import { CustomPageService } from '@app/shared/shared-main/custom-page' |
3 | 3 | ||
4 | @Component({ | 4 | @Component({ |
5 | templateUrl: './home.component.html', | 5 | templateUrl: './home.component.html' |
6 | }) | 6 | }) |
7 | 7 | ||
8 | export class HomeComponent implements OnInit { | 8 | export class HomeComponent implements OnInit { |
diff --git a/client/src/app/+login/login.component.scss b/client/src/app/+login/login.component.scss index f981cd3d3..c588c425a 100644 --- a/client/src/app/+login/login.component.scss +++ b/client/src/app/+login/login.component.scss | |||
@@ -2,7 +2,7 @@ | |||
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | label { | 4 | label { |
5 | @include font-size(1.125rem); | 5 | @include font-size(18px); |
6 | 6 | ||
7 | display: block; | 7 | display: block; |
8 | margin-bottom: 5px; | 8 | margin-bottom: 5px; |
@@ -30,7 +30,7 @@ input[type=email] { | |||
30 | } | 30 | } |
31 | 31 | ||
32 | .alert { | 32 | .alert { |
33 | @include margin(0, auto, 2rem, auto); | 33 | @include margin(0, auto, 2rem); |
34 | } | 34 | } |
35 | 35 | ||
36 | .login-form-and-externals { | 36 | .login-form-and-externals { |
diff --git a/client/src/app/+video-channels/video-channels.component.scss b/client/src/app/+video-channels/video-channels.component.scss index 945d9a13d..c8b182196 100644 --- a/client/src/app/+video-channels/video-channels.component.scss +++ b/client/src/app/+video-channels/video-channels.component.scss | |||
@@ -264,10 +264,6 @@ | |||
264 | width: min-content; | 264 | width: min-content; |
265 | } | 265 | } |
266 | 266 | ||
267 | .show-more { | ||
268 | margin-bottom: 30px; | ||
269 | } | ||
270 | |||
271 | .bottom-owner { | 267 | .bottom-owner { |
272 | padding: 15px; | 268 | padding: 15px; |
273 | margin-bottom: 30px; | 269 | margin-bottom: 30px; |