Correctly copy ffmpeg

[github/Chocobozzz/PeerTube.git] / client / src / sass / application.scss

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index dae0c52c213e2b654b16ff2ab61abd9739d52865..ba8701f5ca321e3a03c4b24e43a791ac5b07c8f2 100644 (file)
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,7 +1,7 @@
 @import '_variables';
 @import '_mixins';
 
-$icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/';
+$icon-font-path: '../../node_modules/@neos21/bootstrap3-glyphicons/assets/fonts/';
 @import '_bootstrap';
 
 @import '_fonts';
@@ -22,6 +22,7 @@ body {
   font-family: $main-fonts;
   font-weight: $font-regular;
   color: #000;
+  font-size: 14px;
 }
 
 #incompatible-browser {
@@ -41,6 +42,10 @@ input.readonly {
   background-color: #fff !important;
 }
 
+input, textarea {
+  outline: none;
+}
+
 label {
   font-weight: $font-bold;
   font-size: 15px;
@@ -62,10 +67,12 @@ label {
 
 .main-col {
   margin-left: $menu-width;
+  width: auto;
 
   .margin-content {
     margin-left: $not-expanded-horizontal-margins;
     margin-right: $not-expanded-horizontal-margins;
+    flex-grow: 1;
   }
 
   .sub-menu {
@@ -171,9 +178,13 @@ label {
       @include icon(24px);
 
       position: relative;
-      right: -1px;
+      top: 3px;
       float: right;
       background-image: url('../assets/images/global/cross.svg');
+
+      margin: 0;
+      padding: 0;
+      opacity: 1;
     }
   }
 
@@ -197,47 +208,35 @@ label {
   }
 }
 
-tabset:not(.bootstrap) {
-  .nav {
-    font-size: 16px !important;
-    border: none !important;
+// Nav customizations
+.nav .nav-link {
+  display: flex !important;
+  align-items: center;
+  height: 30px !important;
+  padding: 10px 15px !important;
+}
 
-    .nav-item .nav-link {
-      margin-right: 30px;
-      padding: 0;
-      border-radius: 3px;
-      border: none !important;
-
-      .tab-link {
-        display: flex !important;
-        align-items: center;
-        min-height: 30px !important;
-        padding: 0 15px;
-      }
+.nav.nav-pills {
+  font-size: 16px !important;
 
-      &, & a {
-        color: #000 !important;
-        @include disable-default-a-behaviour;
-      }
+  .nav-link.active {
+    font-weight: $font-semibold !important;
+  }
 
-      &.active, &:hover {
-        background-color: #F0F0F0;
-      }
+  a {
+    @include disable-default-a-behaviour;
 
-      &.active {
-        font-weight: $font-semibold !important;
-      }
-    }
+    color: #000;
   }
 }
 
-tabset.bootstrap {
-  margin-left: 0;
+ngb-tabset.bootstrap {
 
-  .nav-item .nav-link {
+  .nav-link {
     &, & a {
-      color: #000;
       @include disable-default-a-behaviour;
+
+      color: #000 !important;
     }
   }
 }
@@ -286,11 +285,9 @@ table {
   }
 }
 
-// On small screen, menu is absolute
 @media screen and (max-width: 600px) {
-  .title-menu-left {
+  .menu-wrapper {
     width: 100% !important;
-    position: absolute !important;
     z-index: 10000;
   }
 
@@ -313,8 +310,4 @@ table {
       }
     }
   }
-
-  bs-dropdown-container {
-    z-index: 10000;
-  }
 }