From 178af31cb8624567a26a1ca06cba9f3a475be330 Mon Sep 17 00:00:00 2001
From: Wicklow <wicklow@framasoft.org>
Date: Fri, 17 Feb 2023 10:40:37 +0100
Subject: [PATCH] Change bootstrap helpers and variables

---
 .../about-instance.component.html             |  2 +-
 .../about-peertube.component.html             |  6 ++--
 client/src/sass/class-helpers/_common.scss    |  4 +--
 .../_custom-bootstrap-helpers.scss            | 30 +------------------
 client/src/sass/class-helpers/index.scss      | 11 ++-----
 .../sass/include/_bootstrap-variables.scss    |  4 +--
 client/src/sass/include/_variables.scss       |  3 ++
 7 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html
index 5230b5c4e..4c7504628 100644
--- a/client/src/app/+about/about-instance/about-instance.component.html
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -2,7 +2,7 @@
   <div class="col-md-12 col-xl-6">
 
     <div class="d-flex justify-content-between">
-      <h1 i18n class="fw-semibold pt-fs-5">About {{ instanceName }}</h1>
+      <h1 i18n class="fw-semibold fs-5">About {{ instanceName }}</h1>
 
       <a routerLink="/about/contact" i18n *ngIf="isContactFormEnabled" class="peertube-button-link orange-button h-100 d-flex align-items-center">Contact us</a>
     </div>
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html
index c748154e9..c0177fe6c 100644
--- a/client/src/app/+about/about-peertube/about-peertube.component.html
+++ b/client/src/app/+about/about-peertube/about-peertube.component.html
@@ -1,5 +1,5 @@
 <div class="root">
-  <h1 i18n class="pt-fs-3 text-center fw-semibold mb-3">
+  <h1 i18n class="fs-3 text-center fw-semibold mb-3">
     This website is powered by PeerTube
   </h1>
 
@@ -60,7 +60,7 @@
   </div>
 
   <div class="d-flex flex-column">
-    <h2 class="mb-4 mt-5 text-center pt-fs-5 fw-semibold">
+    <h2 class="mb-4 mt-5 text-center fs-5 fw-semibold">
       <div class="anchor" id="privacy"></div> <!-- privacy anchor -->
       <ng-container i18n>P2P & Privacy</ng-container>
     </h2>
@@ -76,7 +76,7 @@
       tracker as long as you download or watch the video.
     </p>
 
-    <h3 i18n class="pt-fs-5">What are the consequences?</h3>
+    <h3 i18n class="fs-5">What are the consequences?</h3>
 
     <p i18n>
       In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video.
diff --git a/client/src/sass/class-helpers/_common.scss b/client/src/sass/class-helpers/_common.scss
index 182c51c8f..d342c2ceb 100644
--- a/client/src/sass/class-helpers/_common.scss
+++ b/client/src/sass/class-helpers/_common.scss
@@ -1,7 +1,7 @@
-@use '_variables' as *;
-@use '_mixins' as *;
 @use '_badges' as *;
 @use '_icons' as *;
+@use '_mixins' as *;
+@use '_variables' as *;
 
 .link-orange {
   color: pvar(--mainForegroundColor);
diff --git a/client/src/sass/class-helpers/_custom-bootstrap-helpers.scss b/client/src/sass/class-helpers/_custom-bootstrap-helpers.scss
index 78c4d30df..d5606181d 100644
--- a/client/src/sass/class-helpers/_custom-bootstrap-helpers.scss
+++ b/client/src/sass/class-helpers/_custom-bootstrap-helpers.scss
@@ -3,34 +3,6 @@
 
 // Font sizes
 
-.pt-fs-1 {
-  @include font-size(2.5rem);
-}
-
-.pt-fs-2 {
-  @include font-size(2rem);
-}
-
-.pt-fs-3 {
-  @include font-size(1.75rem);
-}
-
-.pt-fs-4 {
-  @include font-size(1.5rem);
-}
-
-.pt-fs-5 {
-  @include font-size(1.25rem);
-}
-
-.pt-fs-5-5 {
+.fs-5-5 {
   @include font-size(1.125rem);
-}
-
-.pt-fs-6 {
-  @include font-size(1rem);
-}
-
-.pt-fs-7 {
-  @include font-size(0.875rem);
 }
\ No newline at end of file
diff --git a/client/src/sass/class-helpers/index.scss b/client/src/sass/class-helpers/index.scss
index ad5fd7838..ec0aea52e 100644
--- a/client/src/sass/class-helpers/index.scss
+++ b/client/src/sass/class-helpers/index.scss
@@ -1,10 +1,5 @@
-@use '_variables' as *;
-@use '_mixins' as *;
-@use '_badges' as *;
-@use '_icons' as *;
-@use '_fonts' as *;
-@use '_menu' as *;
 @use '_buttons' as *;
-@use '_forms' as *;
 @use '_common' as *;
-@use '_custom-bootstrap-helpers' as *;
\ No newline at end of file
+@use '_custom-bootstrap-helpers' as *;
+@use '_forms' as *;
+@use '_menu' as *;
\ No newline at end of file
diff --git a/client/src/sass/include/_bootstrap-variables.scss b/client/src/sass/include/_bootstrap-variables.scss
index 1c05f467a..558610893 100644
--- a/client/src/sass/include/_bootstrap-variables.scss
+++ b/client/src/sass/include/_bootstrap-variables.scss
@@ -8,9 +8,9 @@ $grid-breakpoints: (
   // Extra small screen / phone
   xs: 0,
   // Small screen / phone
-  sm: 576px,
+  sm: $mobile-view,
   // Medium screen / tablet
-  md: 768px,
+  md: $small-view,
   // Large screen / desktop
   lg: 900px,
   // Extra large screens / wide desktops
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 8358270da..1243854ec 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -10,6 +10,9 @@ $font-semibold: 600;
 $font-bold: 700;
 $line-height-normal: 1.2;
 
+$font-size-rem-13px: 0.8125rem;
+$font-size-rem-14px: 0.875rem;
+
 $grey-background-color: #E5E5E5;
 $grey-background-hover-color: #EFEFEF;
 $grey-foreground-color: #585858;