X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=ba8701f5ca321e3a03c4b24e43a791ac5b07c8f2;hb=e63dbd426e67672b4014c2a3ac3a227fbe26e886;hp=84ffbec65316ee0be8155e27ceaab230db43ce22;hpb=1f788f2044928325e48c5d88ecbc72501873558e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 84ffbec65..ba8701f5c 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,27 +1,40 @@
 @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';
 
-$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/player';
 @import './loading-bar';
 
+@import './primeng-custom';
+
 [hidden] {
   display: none !important;
 }
 
 body {
-  font-family: 'Source Sans Pro', sans-serif;
+  font-family: $main-fonts;
   font-weight: $font-regular;
   color: #000;
+  font-size: 14px;
+}
+
+#incompatible-browser {
+  display: none;
+  text-align: center;
+  position: absolute;
+  width: 100%;
+  top: 45%;
+}
+
+strong {
+  font-weight: $font-semibold;
 }
 
 input.readonly {
@@ -29,6 +42,10 @@ input.readonly {
   background-color: #fff !important;
 }
 
+input, textarea {
+  outline: none;
+}
+
 label {
   font-weight: $font-bold;
   font-size: 15px;
@@ -50,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 {
@@ -99,6 +118,10 @@ label {
   &:hover, &:active, &:focus {
     color: #000;
   }
+
+  @media screen and (max-width: 500px) {
+    margin-right: 20px;
+  }
 }
 
 .admin-sub-header {
@@ -106,12 +129,12 @@ label {
   align-items: center;
   margin-bottom: 30px;
 
-  .admin-sub-title {
+  .form-sub-title {
     flex-grow: 1;
   }
 }
 
-.admin-sub-title {
+.form-sub-title {
   font-size: 20px;
   font-weight: bold;
 }
@@ -126,124 +149,6 @@ label {
   to { transform: scale(1) rotate(360deg);}
 }
 
-// ngprime data table customizations
-p-datatable {
-  font-size: 15px !important;
-
-  .ui-datatable-scrollable-header {
-    background-color: #fff !important;
-  }
-
-  .ui-widget-content {
-    border: none !important;
-  }
-
-  .ui-datatable-virtual-table {
-    border-top: none !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;
-
-    &: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;
-    }
-  }
-
-  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-active {
-      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;
@@ -273,9 +178,13 @@ p-datatable {
       @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;
     }
   }
 
@@ -299,34 +208,35 @@ p-datatable {
   }
 }
 
-.nav {
+// 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;
-  border: none !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-link.active {
+    font-weight: $font-semibold !important;
+  }
+
+  a {
+    @include disable-default-a-behaviour;
+
+    color: #000;
+  }
+}
+
+ngb-tabset.bootstrap {
+
+  .nav-link {
     &, & a {
-      color: #000 !important;
       @include disable-default-a-behaviour;
-    }
 
-    &.active, &:hover {
-      background-color: #F0F0F0;
-    }
-
-    &.active {
-      font-weight: $font-semibold !important;
+      color: #000 !important;
     }
   }
 }
@@ -367,15 +277,17 @@ table {
         margin-left: 50px;
         margin-right: 50px;
       }
+
+      .sub-menu {
+        padding-left: 50px;
+      }
     }
   }
 }
 
-// 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;
   }
 
@@ -389,7 +301,7 @@ table {
       }
 
       .sub-menu {
-        padding-left: 10px;
+        padding-left: 15px;
         margin-bottom: 10px;
       }
 
@@ -398,8 +310,4 @@ table {
       }
     }
   }
-
-  bs-dropdown-container {
-    z-index: 10000;
-  }
 }