X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=fa245223113a01e7536d109cae0cb439d329a27f;hb=14aa85562cb83559d20105b4ddb4bf8b2340578a;hp=b96cf07c0849e4bfc3b035d1cd71196e8b6545f6;hpb=dcbc29d5c89cc5106a7e738af6861565f740dbe7;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index b96cf07c0..fa2452231 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,5 +1,4 @@
-$icon-font-path: '../../node_modules/@neos21/bootstrap3-glyphicons/assets/fonts/';
-@import '_bootstrap';
+$icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 
 @import '_variables';
 @import '_mixins';
@@ -9,9 +8,10 @@ $icon-font-path: '../../node_modules/@neos21/bootstrap3-glyphicons/assets/fonts/
 @import '~video.js/dist/video-js.css';
 
 $assets-path: '../assets/';
-@import './player/player';
+@import './player/index';
 @import './loading-bar';
 
+@import './bootstrap';
 @import './primeng-custom';
 
 [hidden] {
@@ -23,16 +23,27 @@ body {
   // now beware node-sass requires interpolation
   // for css custom properties #{$var}
   --mainColor: #{$orange-color};
-  --mainHoverColor: #{$orange-hoover-color};
+  --mainHoverColor: #{$orange-hover-color};
   --mainBackgroundColor: #{$bg-color};
   --mainForegroundColor: #{$fg-color};
+  --secondaryColor: #{$cyan-color};
+
+  --menuBackgroundColor: #{$menu-background};
+  --menuForegroundColor: #{$menu-color};
   --submenuColor: #{$sub-menu-color};
-  --inputColor: #{$input-color};
+
+  --inputBackgroundColor: #{$input-background-color};
   --inputPlaceholderColor: #{$input-placeholder-color};
 
+  --actionButtonColor: #{$grey-foreground-color};
+  --supportButtonBackgroundColor: #{transparent};
+  --supportButtonColor: #{var(--actionButtonColor)};
+  --supportButtonHeartColor: #{$support-button-heart};
+
   font-family: $main-fonts;
   font-weight: $font-regular;
   color: var(--mainForegroundColor);
+  background-color: var(--mainBackgroundColor);
   font-size: 14px;
 }
 
@@ -50,11 +61,16 @@ strong {
 
 input.readonly {
   /* Force blank on readonly inputs */
-  background-color: #fff !important;
+  background-color: var(--inputBackgroundColor) !important;
 }
 
 input, textarea {
   outline: none;
+  color: var(--mainForegroundColor);
+}
+
+.btn-outline-secondary {
+  border-color: $input-border-color;
 }
 
 label {
@@ -97,7 +113,7 @@ label {
     background-color: var(--submenuColor);
     width: 100%;
     height: 81px;
-    margin-bottom: 30px;
+    margin-bottom: $sub-menu-margin-bottom;
     display: flex;
     align-items: center;
     padding-left: $not-expanded-horizontal-margins;
@@ -129,18 +145,25 @@ label {
   @include disable-default-a-behaviour;
 
   &.active, &.title-page-single {
-    border-bottom: 2px solid var(--mainColor);
-    font-weight: $font-bold;
     margin-top: 30px;
     margin-bottom: 25px;
   }
 
+  &.active {
+    font-weight: $font-bold;
+    border-bottom: 2px solid var(--mainColor);
+  }
+
+  &.title-page-single {
+    font-size: 125%;
+  }
+
   &:hover, &:active, &:focus {
     color: var(--mainForegroundColor);
   }
 
   @media screen and (max-width: 500px) {
-    margin-right: 20px;
+    margin-right: 15px;
   }
 }
 
@@ -174,137 +197,16 @@ label {
   font-weight: bold;
 }
 
-// Thanks https://gist.github.com/alexandrevicenzi/680147013e902a4eaa5d
-.glyphicon-refresh-animate {
-  animation: spin .7s infinite linear;
-}
-
 @keyframes spin {
   from { transform: scale(1) rotate(0deg);}
   to { transform: scale(1) rotate(360deg);}
 }
 
-// Bootstrap customizations
-.dropdown-menu {
-  border-radius: 3px;
-  box-shadow: 0 3px 6px;
-  font-size: 15px;
-
-  .dropdown-item {
-    padding: 3px 15px;
-  }
-
-  a {
-    color: #000 !important;
-  }
-}
-
-.modal {
-  .modal-content {
-    background-color: var(--mainBackgroundColor);
-  }
-
-  .modal-header {
-    border-bottom: none;
-    margin-bottom: 5px;
-
-    .modal-title {
-      font-size: 20px;
-      font-weight: $font-semibold;
-    }
-
-    .close {
-      @include icon(24px);
-
-      position: relative;
-      top: 3px;
-      float: right;
-      background-image: url('../assets/images/global/cross.svg');
-
-      margin: 0;
-      padding: 0;
-      opacity: 1;
-    }
-  }
-
-  .inputs {
-    margin-top: 40px;
-    margin-bottom: 0;
-    text-align: right;
-
-    .action-button-cancel {
-      @include peertube-button;
-      @include grey-button;
-
-      display: inline-block;
-      margin-right: 10px;
-    }
-
-    .action-button-submit {
-      @include peertube-button;
-      @include orange-button;
-    }
-  }
-}
-
-// Nav customizations
-.nav .nav-link {
-  display: flex !important;
-  align-items: center;
-  height: 30px !important;
-  padding: 10px 15px !important;
-}
-
-.nav.nav-pills {
-  font-size: 16px !important;
-
-  .nav-link.active {
-    font-weight: $font-semibold !important;
-  }
-
-  a {
-    @include disable-default-a-behaviour;
-
-    color: var(--mainForegroundColor);
-  }
-}
-
-ngb-tabset.bootstrap {
-
-  .nav-link {
-    &, & a {
-      @include disable-default-a-behaviour;
-
-      color: var(--mainForegroundColor) !important;
-    }
-  }
-}
-
-.orange-button {
-  @include peertube-button;
-  @include orange-button;
-}
-
-.orange-button-link {
-  @include peertube-button-link;
-  @include orange-button;
-}
-
-.grey-button {
-  @include peertube-button;
-  @include grey-button;
-}
-
-.grey-button-link {
-  @include peertube-button-link;
-  @include grey-button;
-}
-
 // In tables, don't have a hover different background
 table {
   .action-button-edit, .action-button-delete {
     &:hover, &:active, &:focus, &[disabled], &.disabled {
-      background-color: $grey-color !important;
+      background-color: $grey-background-color !important;
     }
   }
 }
@@ -318,7 +220,7 @@ table {
   font-weight: $font-semibold;
 }
 
-@media screen and (max-width: 1200px) {
+@media screen and (max-width: 1600px) {
   .main-col {
     &.expanded {
       .margin-content {
@@ -359,6 +261,8 @@ table {
       }
 
       .sub-menu {
+        width: 100vw;
+        overflow-x: auto;
         padding-left: 15px;
         padding-right: 15px;
         margin-bottom: 10px;
@@ -369,4 +273,4 @@ table {
       }
     }
   }
-}
\ No newline at end of file
+}