X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=84b575eb3d49c927b4c15cb0d5b3921d002441a9;hb=30f9010a82d34d2e04bf20afa46f5ee8da833e28;hp=25db9167031aba793b1363362cdd280a8a674d4e;hpb=4f926722ea6784ea389013378fd233f59077ec8a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 25db91670..84b575eb3 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,19 +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 *;
 
-@import '~video.js/dist/video-js.css';
+@use '_fonts';
 
-$assets-path: '../../assets/';
-@import './player/index';
+@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.scss';
+
+@import './z-index';
 
 [hidden] {
   display: none !important;
@@ -26,17 +30,24 @@ 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};
-  --submenuColor: #{$sub-menu-color};
+
+  --submenuBackgroundColor: #{$sub-menu-background-color};
+  --channelBackgroundColor: #{$channel-background-color};
 
   --inputForegroundColor: #{$input-foreground-color};
   --inputBackgroundColor: #{$input-background-color};
@@ -47,13 +58,16 @@ body {
   --markdownTextareaBackgroundColor: #{$markdown-textarea-background-color};
 
   --actionButtonColor: #{$grey-foreground-color};
+
   --supportButtonBackgroundColor: #{transparent};
   --supportButtonColor: #{pvar(--actionButtonColor)};
   --supportButtonHeartColor: #{$support-button-heart};
 
   --activatedActionButtonColor: #{$activated-action-button-color};
 
-  --expanded-horizontal-margin-content: #{$expanded-horizontal-margins};
+  --horizontalMarginContent: #{$not-expanded-horizontal-margins};
+  --videosHorizontalMarginContent: 6vw;
+  --mainColWidth: calc(100vw - #{$menu-width});
 
   font-family: $main-fonts;
   font-weight: $font-regular;
@@ -64,6 +78,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 {
@@ -71,31 +88,33 @@ body {
   background-color: pvar(--mainHoverColor);
 }
 
+noscript,
 #incompatible-browser {
-  display: none;
-  text-align: center;
-  position: absolute;
-  width: 100%;
-  top: 45%;
+  display: block;
+  font-size: 1.2rem;
+  max-width: 600px;
+  margin: 1rem auto;
 }
 
 strong {
   font-weight: $font-semibold;
 }
 
-input.readonly {
+input[readonly] {
   /* Force blank on readonly inputs */
   background-color: pvar(--inputBackgroundColor) !important;
 }
 
-input, textarea {
+input,
+textarea {
   outline: none;
-  color: pvar(--mainForegroundColor);
+  color: pvar(--inputForegroundColor);
 }
 
 button {
-  background: unset;
   @include disable-outline;
+
+  background: unset;
 }
 
 label {
@@ -105,6 +124,7 @@ label {
 
 code {
   background-color: pvar(--greyBackgroundColor);
+  color: pvar(--greyForegroundColor);
   border-radius: 3px;
   padding: .2em .4em;
   margin: auto .4em;
@@ -113,25 +133,29 @@ code {
   vertical-align: middle;
 }
 
-.form-error {
+.form-error,
+.form-warning {
   display: block;
-  color: $red;
   margin-top: 5px;
 }
 
-.input-error {
+.form-error {
+  color: $red;
+}
+
+.input-error,
+my-input-toggle-hidden ::ng-deep input {
   border-color: $red !important;
 }
 
-.fullWidth {
+.full-width {
   width: 100%;
-  margin-left: auto;
-  margin-right: auto;
+  margin: 0 auto;
   max-width: initial;
 }
 
 .glyphicon-black {
-  color: black;
+  color: #000;
 }
 
 .row {
@@ -139,29 +163,30 @@ code {
 }
 
 .main-col {
-  margin-left: $menu-width;
+  @include margin-left($menu-width);
+
   width: calc(100% - #{$menu-width});
   outline: none;
 
   .margin-content {
-    margin-left: $not-expanded-horizontal-margins;
-    margin-right: $not-expanded-horizontal-margins;
+    margin: 0 pvar(--horizontalMarginContent);
     flex-grow: 1;
   }
 
   .sub-menu {
-    background-color: pvar(--submenuColor);
+    background-color: pvar(--submenuBackgroundColor);
     width: 100%;
     display: flex;
     align-items: center;
-    padding-left: $not-expanded-horizontal-margins;
-    padding-right: $not-expanded-horizontal-margins;
+    padding: 0 pvar(--horizontalMarginContent);
     height: $sub-menu-height;
     margin-bottom: $sub-menu-margin-bottom;
+    overflow-x: auto;
 
     &.sub-menu-fixed {
       position: fixed;
       z-index: #{z('sub-menu') - 1};
+      max-width: pvar(--mainColWidth);
     }
   }
 
@@ -172,40 +197,33 @@ code {
 
   // Override some properties if the main content is expanded (no menu on the left)
   &.expanded {
-    margin-left: 0;
-    width: 100%;
-
-    .margin-content {
-      margin-left: var(--expanded-horizontal-margin-content);
-      margin-right: var(--expanded-horizontal-margin-content);
-    }
+    --horizontalMarginContent: #{$expanded-horizontal-margins};
+    --mainColWidth: 100vw;
 
-    .sub-menu {
-      padding-left: var(--expanded-horizontal-margin-content);
-      padding-right: var(--expanded-horizontal-margin-content);
-    }
+    @include margin-left(0);
+    width: 100%;
   }
 
-  &.lock-scroll .main-row > router-outlet + * {
+  &.lock-scroll .main-row > router-outlet + * {  /* stylelint-disable-line selector-max-compound-selectors */
     // Lock and hide body scrollbars
     position: fixed;
 
     // Lock and hide sub-menu scrollbars
-    .sub-menu {
+    .sub-menu { /* stylelint-disable-line */
       overflow-x: hidden;
     }
   }
 }
 
 .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;
-  @include disable-default-a-behaviour;
-
   border-bottom: 2px solid transparent;
 
   &.title-page-single {
@@ -221,17 +239,23 @@ code {
     font-size: 125%;
   }
 
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     color: pvar(--mainForegroundColor);
   }
 
-  &.active, &:hover,  &:active, &:focus, &.title-page-single {
+  &.active,
+  &:hover,
+  &:active,
+  &:focus,
+  &.title-page-single {
     opacity: 1;
-    outline: 0px hidden !important;
+    outline: 0 hidden !important;
   }
 
   @media screen and (max-width: $mobile-view) {
-    margin-right: 15px;
+    @include margin-left(15px);
   }
 }
 
@@ -245,45 +269,17 @@ code {
   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: #f0f0f0;
-    }
-
-    &.active, &:hover, &:active, &:focus {
-      opacity: 1;
-    }
-  }
-}
-
-.form-sub-title {
-  font-size: 20px;
-  font-weight: bold;
-}
-
-@keyframes spin {
-  from { transform: scale(1) rotate(0deg);}
-  to { transform: scale(1) rotate(360deg);}
 }
 
 // In tables, don't have a hover different background
 table {
-  .action-button-edit, .action-button-delete {
-    &:hover, &:active, &:focus, &[disabled], &.disabled {
+  .action-button-edit,
+  .action-button-delete {
+    &:hover,
+    &:active,
+    &:focus,
+    &[disabled],
+    &.disabled {
       background-color: $grey-background-color !important;
     }
   }
@@ -324,41 +320,38 @@ 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: #{math.div($not-expanded-horizontal-margins, 2)};
+    --videosHorizontalMarginContent: 30px;
+
     &.expanded {
-      .margin-content {
-        --expanded-horizontal-margin-content: #{$expanded-horizontal-margins/2};
-      }
+      --horizontalMarginContent: #{math.div($expanded-horizontal-margins, 2)};
     }
   }
 }
 
 @media screen and (max-width: #{breakpoint(lg)}) {
-  /* the following applies from 500px to 900px and is partially overriden from 500px to 800px by changes below to $small-view */
   .main-col {
-    &, &.expanded {
-      .margin-content {
-        --expanded-horizontal-margin-content: #{$expanded-horizontal-margins/3};
-      }
+    --videosHorizontalMarginContent: #{pvar(--horizontalMarginContent)};
+  }
+
+  /* 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: #{math.div($expanded-horizontal-margins, 3)};
 
-      .sub-menu {
-        padding-left: 50px;
-        padding-right: 50px;
+    .sub-menu {
+      padding: 0 50px;
 
-        .title-page {
-          font-size: 17px;
-        }
+      .title-page {
+        font-size: 17px;
       }
     }
   }
@@ -371,98 +364,45 @@ ngx-loading-bar {
 }
 
 @media screen and (max-width: $small-view) {
-  .main-col {
-    margin-left: 0;
-
-    &, &.expanded {
-      .margin-content {
-        --expanded-horizontal-margin-content: 15px;
-      }
-
-      .sub-menu {
-        width: 100vw;
-        padding-left: 15px;
-        padding-right: 15px;
-        margin-bottom: $sub-menu-margin-bottom-small-view;
-        overflow-x: auto;
-      }
-
-      // Use an appropriate offset top when sub-menu fixed
-      .margin-content.offset-content {
-        padding-top: $sub-menu-height + $sub-menu-margin-bottom-small-view;
-      }
-
-      .admin-sub-header {
-        @include admin-sub-header-responsive(15px*2);
-      }
-
-      my-markdown-textarea {
-        .root {
-          max-width: 100% !important;
-        }
-      }
-
-      input[type=text],
-      input[type=password],
-      input[type=email],
-      textarea,
-      .peertube-select-container {
-        flex-grow: 1;
-      }
+  .main-col,
+  .main-col.expanded {
+    --horizontalMarginContent: 15px;
 
-      .caption input[type=text] {
-        width: unset !important;
-        flex-grow: 1;
-      }
-    }
-  }
-}
+    @include margin-left(0);
 
-// overflow-databale responsive rules
-@media screen and (min-width: #{breakpoint(lg)}) {
-  .main-col {
-    &.expanded {
-      @include overflow-datatable(breakpoint(lg), $expanded-horizontal-margins/2, $mobile-paginator: false);
+    .sub-menu {
+      width: 100vw;
+      padding: 0 15px;
+      margin-bottom: $sub-menu-margin-bottom-small-view;
+      overflow-x: auto;
     }
 
-    &:not(.expanded) {
-      @include overflow-datatable(breakpoint(lg), $not-expanded-horizontal-margins + $menu-width/2, $mobile-paginator: false);
+    // Use an appropriate offset top when sub-menu fixed
+    .margin-content.offset-content {
+      padding-top: $sub-menu-height + $sub-menu-margin-bottom-small-view;
     }
-  }
-}
 
-@media screen and (max-width: #{breakpoint(lg)}) {
-  .main-col {
-    &.expanded {
-      @include overflow-datatable(breakpoint(lg), $expanded-horizontal-margins/3);
+    .admin-sub-header {
+      flex-direction: column;
     }
 
-    &:not(.expanded) {
-      @include overflow-datatable(breakpoint(lg), $expanded-horizontal-margins/3 + $menu-width/2);
+    my-markdown-textarea {
+      .root {
+        max-width: 100% !important;
+      }
     }
-  }
-}
 
-@media screen and (max-width: $small-view) {
-  .main-col {
-    &:not(.expanded),
-    &.expanded {
-      @include overflow-datatable(breakpoint(lg), 15px);
+    input[type=text],
+    input[type=password],
+    input[type=email],
+    textarea,
+    .peertube-select-container {
+      flex-grow: 1;
     }
-  }
-}
-
-@media screen and (min-width: $small-view) and (max-width: #{$small-view + $menu-width}) {
-  .main-col {
-    &:not(.expanded) {
-      .admin-sub-header {
-        @include admin-sub-header-responsive($expanded-horizontal-margins/3 + $menu-width/2);
-      }
 
-      .sub-menu {
-        overflow-x: auto;
-        width: calc(100vw - #{$menu-width});
-      }
+    .caption input[type=text] {
+      width: unset !important;
+      flex-grow: 1;
     }
   }
 }