X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=bd834db701f03084742b7e6830657378b7f93d51;hb=af7fd04a6706fb781e4622167b08dc6c9376f06a;hp=89b6f0c4cceb17508efd2dfa3fb1083949b457b2;hpb=931d3430184143ebd88e5243def6eb1d7acfdbf4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 89b6f0c4c..bd834db70 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,16 +1,19 @@
 $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 
-@import '_bootstrap-variables';
-@import '_variables';
-@import '_mixins';
+@use '_variables' as *;
+@use '_mixins' as *;
 
-@import '_fonts';
+@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';
 
 [hidden] {
   display: none !important;
@@ -65,6 +68,9 @@ body {
   // Allow to disable the scrollbar instead of hide it when the content fit the body
   // And not move the content and header horizontally sticked to right when the content is updating
   overflow-y: scroll;
+
+  // Fix "reboot" style that set text-align: left
+  text-align: start;
 }
 
 ::selection {
@@ -117,12 +123,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;
@@ -130,8 +140,7 @@ my-input-toggle-hidden ::ng-deep input {
 
 .full-width {
   width: 100%;
-  margin-left: auto;
-  margin-right: auto;
+  margin: 0 auto;
   max-width: initial;
 }
 
@@ -144,13 +153,13 @@ my-input-toggle-hidden ::ng-deep input {
 }
 
 .main-col {
-  margin-left: $menu-width;
+  @include margin-left($menu-width);
+
   width: calc(100% - #{$menu-width});
   outline: none;
 
   .margin-content {
-    margin-left: pvar(--horizontalMarginContent);
-    margin-right: pvar(--horizontalMarginContent);
+    margin: 0 pvar(--horizontalMarginContent);
     flex-grow: 1;
   }
 
@@ -159,8 +168,7 @@ my-input-toggle-hidden ::ng-deep input {
     width: 100%;
     display: flex;
     align-items: center;
-    padding-left: pvar(--horizontalMarginContent);
-    padding-right: pvar(--horizontalMarginContent);
+    padding: 0 pvar(--horizontalMarginContent);
     height: $sub-menu-height;
     margin-bottom: $sub-menu-margin-bottom;
     overflow-x: auto;
@@ -182,7 +190,7 @@ my-input-toggle-hidden ::ng-deep input {
     --horizontalMarginContent: #{$expanded-horizontal-margins};
     --mainColWidth: 100vw;
 
-    margin-left: 0;
+    @include margin-left(0);
     width: 100%;
   }
 
@@ -199,12 +207,12 @@ my-input-toggle-hidden ::ng-deep input {
 
 .title-page {
   @include disable-default-a-behaviour;
+  @include margin-right(55px);
 
   opacity: 0.6;
   color: pvar(--mainForegroundColor);
   font-size: 16px;
   display: inline-block;
-  margin-right: 55px;
   font-weight: $font-semibold;
   border-bottom: 2px solid transparent;
 
@@ -237,7 +245,7 @@ my-input-toggle-hidden ::ng-deep input {
   }
 
   @media screen and (max-width: $mobile-view) {
-    margin-right: 15px;
+    @include margin-left(15px);
   }
 }
 
@@ -365,8 +373,7 @@ ngx-loading-bar {
     --horizontalMarginContent: #{$expanded-horizontal-margins / 3};
 
     .sub-menu {
-      padding-left: 50px;
-      padding-right: 50px;
+      padding: 0 50px;
 
       .title-page {
         font-size: 17px;
@@ -386,12 +393,11 @@ ngx-loading-bar {
   .main-col.expanded {
     --horizontalMarginContent: 15px;
 
-    margin-left: 0;
+    @include margin-left(0);
 
     .sub-menu {
       width: 100vw;
-      padding-left: 15px;
-      padding-right: 15px;
+      padding: 0 15px;
       margin-bottom: $sub-menu-margin-bottom-small-view;
       overflow-x: auto;
     }
@@ -402,7 +408,27 @@ ngx-loading-bar {
     }
 
     .admin-sub-header {
-      @include admin-sub-header-responsive;
+      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 {