X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=84b575eb3d49c927b4c15cb0d5b3921d002441a9;hb=26da644eab9ef62a3e559ac5626bb65a0b13a14d;hp=799b8c881fa7813aacd94f938d5ea024391c39e5;hpb=27bc95867442c772841fb183a625bbda61dede51;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 799b8c881..84b575eb3 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,16 +1,23 @@
 $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 
-@import '_bootstrap-variables';
-@import '_variables';
-@import '_mixins';
+@use 'sass:math';
 
-@import '_fonts';
+@use '_variables' as *;
+@use '_mixins' as *;
 
+@use '_fonts';
+
+@use './classes';
+
+@use './custom-markup';
+
+@use './ng-select';
+
+// Needs an import because we extends glyphicon icons in primeng
 @import './bootstrap';
 @import './primeng-custom';
-@import './ng-select';
 
-@import './classes';
+@import './z-index';
 
 [hidden] {
   display: none !important;
@@ -23,13 +30,18 @@ body {
   --mainColor: #{$main-color};
   --mainColorLighter: #{$main-color-lighter};
   --mainColorLightest: #{$main-color-lightest};
+
   --mainHoverColor: #{$main-hover-color};
+  --mainBackgroundHoverColor: #{$main-background-hover-color};
+
   --mainBackgroundColor: #{$bg-color};
   --mainForegroundColor: #{$fg-color};
+
   --secondaryColor: #{$secondary-color};
 
   --greyForegroundColor: #{$grey-foreground-color};
   --greyBackgroundColor: #{$grey-background-color};
+  --greySecondaryBackgroundColor: #{$grey-background-hover-color};
 
   --menuBackgroundColor: #{$menu-background};
   --menuForegroundColor: #{$menu-color};
@@ -46,6 +58,7 @@ body {
   --markdownTextareaBackgroundColor: #{$markdown-textarea-background-color};
 
   --actionButtonColor: #{$grey-foreground-color};
+
   --supportButtonBackgroundColor: #{transparent};
   --supportButtonColor: #{pvar(--actionButtonColor)};
   --supportButtonHeartColor: #{$support-button-heart};
@@ -87,7 +100,7 @@ strong {
   font-weight: $font-semibold;
 }
 
-input.readonly {
+input[readonly] {
   /* Force blank on readonly inputs */
   background-color: pvar(--inputBackgroundColor) !important;
 }
@@ -120,12 +133,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;
@@ -252,37 +269,6 @@ my-input-toggle-hidden ::ng-deep input {
   display: flex;
   align-items: center;
   margin-bottom: 30px;
-
-  .form-sub-title {
-    flex-grow: 1;
-  }
-
-  .admin-sub-nav a {
-    @include disable-default-a-behaviour;
-
-    font-size: 16px;
-    color: pvar(--mainForegroundColor);
-    padding: 5px 15px;
-    border-radius: 0.25rem;
-    font-weight: $font-semibold;
-    opacity: 0.6;
-
-    &.active {
-      background-color: pvar(--submenuBackgroundColor);
-    }
-
-    &.active,
-    &:hover,
-    &:active,
-    &:focus {
-      opacity: 1;
-    }
-  }
-}
-
-.form-sub-title {
-  font-size: 20px;
-  font-weight: bold;
 }
 
 // In tables, don't have a hover different background
@@ -334,23 +320,19 @@ table {
 }
 
 .form-group-description {
-  @extend .text-muted;
+  @extend .muted !optional;
 
   font-size: 90%;
   margin-top: 10px;
 }
 
-ngx-loading-bar {
-  z-index: z(header) + 1 !important;
-}
-
 @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 +345,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;
@@ -402,26 +384,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;
-        white-space: nowrap;
-        height: 50px;
-        padding: 10px 0;
-        width: 100%;
-
-        a {
-          @include margin-left(5px);
-        }
-      }
     }
 
     my-markdown-textarea {