Refactoring margin and padding mixins

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 @@
   <h1 class="visually-hidden" i18n>Follows</h1>
 
   <div class="col-xl-6 col-md-12">
-    <h2 i18n class="pt-fs-5-5 mb-4 fw-semibold">Followers of {{ instanceName }} ({{ followersPagination.totalItems }})</h2>
+    <h2 i18n class="fs-5-5 mb-4 fw-semibold">Followers of {{ instanceName }} ({{ followersPagination.totalItems }})</h2>
 
     <div i18n class="no-results" *ngIf="followersPagination.totalItems === 0">{{ instanceName }} does not have followers.</div>
 
@@ -14,7 +14,7 @@
   </div>
 
   <div class="col-xl-6 col-md-12">
-    <h2 i18n class="pt-fs-5-5 mb-4 fw-semibold">Subscriptions of {{ instanceName }} ({{ followingsPagination.totalItems }})</h2>
+    <h2 i18n class="fs-5-5 mb-4 fw-semibold">Subscriptions of {{ instanceName }} ({{ followingsPagination.totalItems }})</h2>
 
     <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">{{ instanceName }} does not have subscriptions.</div>
 
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 @@
 }
 
 .card {
-  @include rfs(2rem, margin);
+  @include margin(2rem);
 
   flex-basis: 300px;
 }
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 @@
 }
 
 .channel {
-  @include rfs(2rem, padding);
-  @include rfs(2rem 0, margin);
+  @include padding(1.75rem);
+  @include margin(2rem, 0);
 
   max-width: $max-channels-width;
   background-color: pvar(--channelBackgroundColor);
@@ -110,10 +110,6 @@ my-subscribe-button {
 }
 
 @include on-small-main-col {
-  .channel {
-    padding: 15px;
-  }
-
   .channel-avatar-row {
     grid-template-columns: auto auto auto 1fr;
 
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 @@
               <h1 i18n-title [title]="'Created on ' + (account.createdAt | date)">{{ account.displayName }}</h1>
 
               <my-user-moderation-dropdown
-                class="mx-3" prependActions]="prependModerationActions"
+                class="mx-3" [prependActions]="prependModerationActions"
                 buttonSize="small" [account]="account" [user]="accountUser" placement="bottom-left auto"
                 (userChanged)="onUserChanged()" (userDeleted)="onUserDeleted()"
               ></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 @@
 
 @media screen and (max-width: $mobile-view) {
   .root {
-    --myFontSize: $font-size-rem-14px;
-    --myGreyFontSize: $font-size-rem-13px;
+    --myFontSize: 14px;
+    --myGreyFontSize: 13px;
   }
 
   .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'
 import { CustomPageService } from '@app/shared/shared-main/custom-page'
 
 @Component({
-  templateUrl: './home.component.html',
+  templateUrl: './home.component.html'
 })
 
 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 @@
 @use '_mixins' as *;
 
 label {
-  @include font-size(1.125rem);
+  @include font-size(18px);
 
   display: block;
   margin-bottom: 5px;
@@ -30,7 +30,7 @@ input[type=email] {
 }
 
 .alert {
-  @include margin(0, auto, 2rem, auto);
+  @include margin(0, auto, 2rem);
 }
 
 .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 @@
     width: min-content;
   }
 
-  .show-more {
-    margin-bottom: 30px;
-  }
-
   .bottom-owner {
     padding: 15px;
     margin-bottom: 30px;