X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=2356f98371a4ad64c88cdb68f58ed2fe46106a25;hb=71e318b4fe66175d03c7c82357d60062eb68af81;hp=f2d9f720126537e8466171cafea95cc20759a44b;hpb=73e09f270660c78e50e86921a5ca6b356f760c7c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index f2d9f7201..2356f9837 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,27 +1,41 @@
+$icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
+@import '_bootstrap';
+
 @import '_variables';
 @import '_mixins';
 
-$icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/';
-@import '_bootstrap';
-
-$FontPathSourceSansPro: '../../node_modules/npm-font-source-sans-pro/fonts';
-@import '~npm-font-source-sans-pro/source-sans-pro';
+@import '_fonts';
 
-@import '~primeng/resources/themes/bootstrap/theme.css';
-@import '~primeng/resources/primeng.css';
 @import '~video.js/dist/video-js.css';
 
-@import './video-js-custom';
+$assets-path: '../assets/';
+@import './player/index';
 @import './loading-bar';
 
+@import './primeng-custom';
+
 [hidden] {
   display: none !important;
 }
 
 body {
+  /*** theme ***/
+  // now beware node-sass requires interpolation
+  // for css custom properties #{$var}
+  --mainColor: #{$orange-color};
+  --mainHoverColor: #{$orange-hoover-color};
+  --mainBackgroundColor: #{$bg-color};
+  --mainForegroundColor: #{$fg-color};
+  --menuBackgroundColor: #{$menu-background};
+  --menuForegroundColor: #{$menu-color};
+  --submenuColor: #{$sub-menu-color};
+  --inputColor: #{$input-background-color};
+  --inputPlaceholderColor: #{$input-placeholder-color};
+
   font-family: $main-fonts;
   font-weight: $font-regular;
-  color: #000;
+  color: var(--mainForegroundColor);
+  font-size: 14px;
 }
 
 #incompatible-browser {
@@ -38,7 +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 {
@@ -48,12 +71,19 @@ label {
 
 .form-error {
   display: block;
-  color: $red-error;
+  color: $red;
   margin-top: 5px;
 }
 
 .input-error {
-  border-color: $red-error !important;
+  border-color: $red !important;
+}
+
+.fullWidth {
+  width: 100%;
+  margin-left: auto;
+  margin-right: auto;
+  max-width: initial;
 }
 
 .glyphicon-black {
@@ -62,20 +92,23 @@ 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 {
-    background-color: #F7F7F7;
+    background-color: var(--submenuColor);
     width: 100%;
     height: 81px;
     margin-bottom: 30px;
     display: flex;
     align-items: center;
     padding-left: $not-expanded-horizontal-margins;
+    padding-right: $not-expanded-horizontal-margins;
   }
 
   // Override some properties if the main content is expanded (no menu on the left)
@@ -89,12 +122,13 @@ label {
 
     .sub-menu {
       padding-left: $expanded-horizontal-margins;
+      padding-right: $expanded-horizontal-margins;
     }
   }
 }
 
 .title-page {
-  color: #000;
+  color: var(--mainForegroundColor);
   font-size: 16px;
   display: inline-block;
   margin-right: 55px;
@@ -102,14 +136,18 @@ label {
   @include disable-default-a-behaviour;
 
   &.active, &.title-page-single {
-    border-bottom: 2px solid $orange-color;
+    border-bottom: 2px solid var(--mainColor);
     font-weight: $font-bold;
     margin-top: 30px;
     margin-bottom: 25px;
   }
 
   &:hover, &:active, &:focus {
-    color: #000;
+    color: var(--mainForegroundColor);
+  }
+
+  @media screen and (max-width: 500px) {
+    margin-right: 20px;
   }
 }
 
@@ -118,12 +156,27 @@ label {
   align-items: center;
   margin-bottom: 30px;
 
-  .admin-sub-title {
+  .form-sub-title {
     flex-grow: 1;
   }
+
+  .admin-sub-nav a {
+    @include disable-default-a-behaviour;
+
+    font-size: 16px;
+    color: var(--mainForegroundColor);
+    padding: 5px 15px;
+    border-radius: 0.25rem;
+
+    &.active {
+      font-weight: $font-semibold;
+      background-color: #f0f0f0;
+      color: #000;
+    }
+  }
 }
 
-.admin-sub-title {
+.form-sub-title {
   font-size: 20px;
   font-weight: bold;
 }
@@ -138,122 +191,6 @@ label {
   to { transform: scale(1) rotate(360deg);}
 }
 
-// ngprime data table customizations
-p-table {
-  font-size: 15px !important;
-
-  td {
-    border: 1px solid #E5E5E5 !important;
-    padding-left: 15px !important;
-    overflow: hidden !important;
-    text-overflow: ellipsis !important;
-    white-space: nowrap !important;
-  }
-
-  tr {
-    background-color: #fff !important;
-    height: 46px;
-  }
-
-  .ui-table-tbody {
-    tr {
-      &:hover {
-        background-color: #f0f0f0 !important;
-      }
-
-      &:not(:hover) {
-        .action-cell * {
-          display: none !important;
-        }
-      }
-
-      &:first-child td {
-        border-top: none !important;
-      }
-
-      &:last-child td {
-        border-bottom: none !important;
-      }
-    }
-
-    .expander {
-      cursor: pointer;
-      position: relative;
-      top: 1px;
-    }
-  }
-
-  th {
-    border: none !important;
-    border-bottom: 1px solid #f0f0f0 !important;
-    text-align: left !important;
-    padding: 5px 0 5px 15px !important;
-    font-weight: $font-semibold !important;
-    color: #000 !important;
-
-    &.ui-sortable-column:hover {
-      background-color: #f0f0f0 !important;
-      border: 1px solid #f0f0f0 !important;
-      border-width: 0 1px !important;
-
-      &:first-child {
-        border-width: 0 1px 0 0 !important;
-      }
-    }
-
-    &.ui-state-highlight {
-      background-color: #fff !important;
-
-      .fa {
-        @extend .glyphicon;
-        font-size: 11px;
-
-        &.fa-sort-asc {
-          @extend .glyphicon-triangle-top;
-        }
-
-        &.fa-sort-desc {
-          @extend .glyphicon-triangle-bottom;
-        }
-      }
-    }
-  }
-
-  .action-cell {
-    width: 250px !important;
-    padding: 0 !important;
-    text-align: center;
-  }
-
-  p-paginator {
-    .ui-paginator-bottom {
-      position: relative;
-      border: none !important;
-      border: 1px solid #f0f0f0 !important;
-      height: 40px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      a {
-        color: #000 !important;
-        font-weight: $font-semibold !important;
-        margin-right: 20px !important;
-        outline: 0 !important;
-        border-radius: 3px !important;
-        padding: 5px 2px !important;
-
-        &.ui-state-active {
-          &, &:hover, &:active, &:focus {
-            color: #fff !important;
-            background-color: $orange-color !important;
-          }
-        }
-      }
-    }
-  }
-}
-
 // Bootstrap customizations
 .dropdown-menu {
   border-radius: 3px;
@@ -262,14 +199,27 @@ p-table {
 
   .dropdown-item {
     padding: 3px 15px;
+
+    &:active {
+      color: #000 !important;
+    }
+  }
+
+  button {
+    @include disable-default-a-behaviour;
   }
 
   a {
+    @include disable-default-a-behaviour;
     color: #000 !important;
   }
 }
 
 .modal {
+  .modal-content {
+    background-color: var(--mainBackgroundColor);
+  }
+
   .modal-header {
     border-bottom: none;
     margin-bottom: 5px;
@@ -283,14 +233,17 @@ p-table {
       @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;
     }
   }
 
   .inputs {
-    margin-top: 40px;
     margin-bottom: 0;
     text-align: right;
 
@@ -309,49 +262,44 @@ p-table {
   }
 }
 
-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: var(--mainForegroundColor);
   }
 }
 
-tabset.bootstrap {
-  .nav-item .nav-link {
+ngb-tabset.bootstrap {
+
+  .nav-link {
     &, & a {
-      color: #000;
       @include disable-default-a-behaviour;
+
+      color: var(--mainForegroundColor) !important;
     }
   }
 }
 
+.nav-tabs .nav-link.active {
+  background-color: var(--mainBackgroundColor) !important;
+  border-bottom: none;
+}
+
 .orange-button {
   @include peertube-button;
   @include orange-button;
@@ -381,29 +329,46 @@ table {
   }
 }
 
+.no-results {
+  height: 40vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 16px;
+  font-weight: $font-semibold;
+}
+
+@media screen and (max-width: 1600px) {
+  .main-col {
+    &.expanded {
+      .margin-content {
+        margin-left: $expanded-horizontal-margins/2;
+        margin-right: $expanded-horizontal-margins/2;
+      }
+    }
+  }
+}
+
 @media screen and (max-width: 900px) {
   .main-col {
-    &, &.expanded {
+    &.expanded {
       .margin-content {
-        margin-left: 50px;
-        margin-right: 50px;
+        margin-left: $expanded-horizontal-margins/3;
+        margin-right: $expanded-horizontal-margins/3;
       }
 
       .sub-menu {
         padding-left: 50px;
+
+        .title-page {
+          font-size: 15px;
+        }
       }
     }
   }
 }
 
-// On small screen, menu is absolute
-@media screen and (max-width: 600px) {
-  .title-menu-left {
-    width: 100% !important;
-    position: absolute !important;
-    z-index: 10000;
-  }
-
+@media screen and (max-width: $small-view) {
   .main-col {
     margin-left: 0;
 
@@ -415,6 +380,7 @@ table {
 
       .sub-menu {
         padding-left: 15px;
+        padding-right: 15px;
         margin-bottom: 10px;
       }
 
@@ -423,8 +389,4 @@ table {
       }
     }
   }
-
-  bs-dropdown-container {
-    z-index: 10000;
-  }
-}
+}
\ No newline at end of file