X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=1f8166d8a85da95e40d7617c8102f8df0eee6bac;hb=eeae81428e933b923dc9d9b6c9ce5c9fcf0de1a7;hp=51c21107bc6b816ca2f3bca42c158693f47ecaba;hpb=fa12eacc014aae8094d108634371640f2695bf9f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 51c21107b..1f8166d8a 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,16 +1,21 @@
 $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 
-@use '_bootstrap-variables';
-@use '_variables';
-@use '_mixins';
+@use 'sass:math';
+
+@use '_variables' as *;
+@use '_mixins' as *;
 
 @use '_fonts';
 
-@use './bootstrap';
-@use './primeng-custom';
+@use './classes';
+
+@use './custom-markup';
+
 @use './ng-select';
 
-@use './classes';
+// Needs an import because we extends glyphicon icons in primeng
+@import './bootstrap';
+@import './primeng-custom';
 
 [hidden] {
   display: none !important;
@@ -120,12 +125,16 @@ code {
   vertical-align: middle;
 }
 
-.form-error {
+.form-error,
+.form-warning {
   display: block;
-  color: $red;
   margin-top: 5px;
 }
 
+.form-error {
+  color: $red;
+}
+
 .input-error,
 my-input-toggle-hidden ::ng-deep input {
   border-color: $red !important;
@@ -253,10 +262,6 @@ my-input-toggle-hidden ::ng-deep input {
   align-items: center;
   margin-bottom: 30px;
 
-  .form-sub-title {
-    flex-grow: 1;
-  }
-
   .admin-sub-nav a {
     @include disable-default-a-behaviour;
 
@@ -280,11 +285,6 @@ my-input-toggle-hidden ::ng-deep input {
   }
 }
 
-.form-sub-title {
-  font-size: 20px;
-  font-weight: bold;
-}
-
 // In tables, don't have a hover different background
 table {
   .action-button-edit,
@@ -346,11 +346,11 @@ ngx-loading-bar {
 
 @media screen and (max-width: #{breakpoint(xxl)}) {
   .main-col {
-    --horizontalMarginContent: #{$not-expanded-horizontal-margins / 2};
+    --horizontalMarginContent: #{math.div($not-expanded-horizontal-margins, 2)};
     --videosHorizontalMarginContent: 30px;
 
     &.expanded {
-      --horizontalMarginContent: #{$expanded-horizontal-margins / 2};
+      --horizontalMarginContent: #{math.div($expanded-horizontal-margins, 2)};
     }
   }
 }
@@ -363,7 +363,7 @@ ngx-loading-bar {
   /* the following applies from 500px to 900px and is partially overriden from 500px to 800px by changes below to $small-view */
   .main-col,
   .main-col.expanded {
-    --horizontalMarginContent: #{$expanded-horizontal-margins / 3};
+    --horizontalMarginContent: #{math.div($expanded-horizontal-margins, 3)};
 
     .sub-menu {
       padding: 0 50px;
@@ -403,13 +403,6 @@ ngx-loading-bar {
     .admin-sub-header {
       flex-direction: column;
 
-      .form-sub-title {
-        @include margin-right(0 !important);
-
-        margin-bottom: 10px;
-        text-align: center;
-      }
-
       .admin-sub-nav {
         display: block;
         overflow-x: auto;