X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=968dc5f5887a3496dae7e3dd06c52b809e8752d6;hb=24a8e782d8b2adb208d9cfb8659450395e2e2a77;hp=5277e2070562e6222dad44bdb02d276e07652fa7;hpb=cd83ea1b908efe594c1e03f886c0dc4742b91360;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 5277e2070..968dc5f58 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,9 +1,18 @@
-$FontPathSourceSansPro: "../fonts/source-sans-pro";
-@import '~source-sans-pro/source-sans-pro';
+@import '_variables';
+@import '_mixins';
+
+$icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/';
+@import '~bootstrap-sass/assets/stylesheets/_bootstrap';
+
+$FontPathSourceSansPro: '../../node_modules/npm-font-source-sans-pro/fonts';
+@import '~npm-font-source-sans-pro/source-sans-pro';
+
 @import '~primeng/resources/themes/bootstrap/theme.css';
 @import '~primeng/resources/primeng.css';
 @import '~video.js/dist/video-js.css';
-@import './video-js-custom.scss';
+
+@import './video-js-custom';
+@import './loading-bar';
 
 [hidden] {
   display: none !important;
@@ -107,23 +116,6 @@ label {
   font-weight: bold;
 }
 
-// On small screen, menu is absolute and displayed over the page
-@media screen and (max-width: 500px) {
-  .title-menu-left {
-    width: 120px;
-    position: absolute !important;
-    z-index: 10000;
-  }
-
-  .main-col {
-    width: 100% !important;
-  }
-
-  .fake-menu {
-    display: none;
-  }
-}
-
 // Thanks https://gist.github.com/alexandrevicenzi/680147013e902a4eaa5d
 .glyphicon-refresh-animate {
   -animation: spin .7s infinite linear;
@@ -165,7 +157,7 @@ p-datatable {
 
   td {
     border: 1px solid #E5E5E5 !important;
-    padding: 15px;
+    padding-left: 15px !important;
   }
 
   tr {
@@ -185,6 +177,10 @@ p-datatable {
     &:first-child td {
       border-top: none !important;
     }
+
+    &:last-child td {
+      border-bottom: none !important;
+    }
   }
 
   th {
@@ -195,9 +191,17 @@ p-datatable {
     font-weight: $font-semibold !important;
     color: #000 !important;
 
-    &.ui-state-active, &.ui-sortable-column:hover {
+    &.ui-sortable-column:hover:not(.ui-state-active) {
       background-color: #f0f0f0 !important;
       border: 1px solid #f0f0f0 !important;
+      border-width: 0 1px !important;
+    }
+
+    &.ui-state-active {
+      color: #fff !important;
+      background-color: $orange-color !important;
+      border: 1px solid $orange-color !important;
+      border-width: 0 1px !important;
     }
   }
 
@@ -208,17 +212,10 @@ p-datatable {
   }
 
   p-paginator {
-    overflow: hidden;
-    display: block;
-    padding-top: 2px;
-    border: 1px solid #f0f0f0 !important;
-    border-top: none !important;
-
     .ui-paginator-bottom {
       position: relative;
       border: none !important;
-      border-top: 1px solid #f0f0f0 !important;
-      box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.16);
+      border: 1px solid #f0f0f0 !important;
       height: 40px;
       display: flex;
       justify-content: center;
@@ -269,21 +266,25 @@ p-datatable {
 }
 
 .nav {
-  margin-top: 10px;
   font-size: 16px !important;
   border: none !important;
 
   .nav-item .nav-link {
-    height: 30px !important;
     margin-right: 30px;
-    padding: 0 15px;
-    display: flex;
-    align-items: center;
+    padding: 0;
     border-radius: 3px;
     border: none !important;
 
+    .tab-link {
+      display: flex !important;
+      align-items: center;
+      height: 30px !important;
+      padding: 0 15px;
+    }
+
     &, & a {
       color: #000 !important;
+      @include disable-default-a-behaviour;
     }
 
     &.active, &:hover {
@@ -294,14 +295,8 @@ p-datatable {
       font-weight: $font-semibold !important;
     }
   }
-
-  .tab-content {
-    min-height: 75px;
-    padding: 15px;
-  }
 }
 
-
 .orange-button {
   @include peertube-button;
   @include orange-button;
@@ -321,3 +316,32 @@ p-datatable {
   @include peertube-button-link;
   @include grey-button;
 }
+
+// On small screen, menu is absolute
+@media screen and (max-width: 800px) {
+  .title-menu-left {
+    width: 150px !important;
+    position: absolute !important;
+    z-index: 10000;
+  }
+
+  .main-col {
+    margin-left: 0;
+
+    &, &.expanded {
+      .margin-content {
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+
+      .sub-menu {
+        padding-left: 10px;
+        margin-bottom: 10px;
+      }
+
+      input[type=text], input[type=password] {
+        width: 100% !important;
+      }
+    }
+  }
+}