X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=2356f98371a4ad64c88cdb68f58ed2fe46106a25;hb=276d96529529621d5f70473990095495f2743c29;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..2356f9837 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,4 +1,4 @@
-$icon-font-path: '../../node_modules/@neos21/bootstrap3-glyphicons/assets/fonts/';
+$icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 @import '_bootstrap';
 
 @import '_variables';
@@ -9,7 +9,7 @@ $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 './primeng-custom';
@@ -26,8 +26,10 @@ body {
   --mainHoverColor: #{$orange-hoover-color};
   --mainBackgroundColor: #{$bg-color};
   --mainForegroundColor: #{$fg-color};
+  --menuBackgroundColor: #{$menu-background};
+  --menuForegroundColor: #{$menu-color};
   --submenuColor: #{$sub-menu-color};
-  --inputColor: #{$input-color};
+  --inputColor: #{$input-background-color};
   --inputPlaceholderColor: #{$input-placeholder-color};
 
   font-family: $main-fonts;
@@ -50,11 +52,16 @@ strong {
 
 input.readonly {
   /* Force blank on readonly inputs */
-  background-color: #fff !important;
+  background-color: var(--inputColor) !important;
 }
 
 input, textarea {
   outline: none;
+  color: var(--mainForegroundColor);
+}
+
+.btn-outline-secondary {
+  border-color: $input-border-color;
 }
 
 label {
@@ -192,9 +199,18 @@ label {
 
   .dropdown-item {
     padding: 3px 15px;
+
+    &:active {
+      color: #000 !important;
+    }
+  }
+
+  button {
+    @include disable-default-a-behaviour;
   }
 
   a {
+    @include disable-default-a-behaviour;
     color: #000 !important;
   }
 }
@@ -228,7 +244,6 @@ label {
   }
 
   .inputs {
-    margin-top: 40px;
     margin-bottom: 0;
     text-align: right;
 
@@ -280,6 +295,11 @@ ngb-tabset.bootstrap {
   }
 }
 
+.nav-tabs .nav-link.active {
+  background-color: var(--mainBackgroundColor) !important;
+  border-bottom: none;
+}
+
 .orange-button {
   @include peertube-button;
   @include orange-button;
@@ -318,7 +338,7 @@ table {
   font-weight: $font-semibold;
 }
 
-@media screen and (max-width: 1200px) {
+@media screen and (max-width: 1600px) {
   .main-col {
     &.expanded {
       .margin-content {