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

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 968dc5f58..f2d9f7201 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -2,7 +2,7 @@
 @import '_mixins';
 
 $icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/';
-@import '~bootstrap-sass/assets/stylesheets/_bootstrap';
+@import '_bootstrap';
 
 $FontPathSourceSansPro: '../../node_modules/npm-font-source-sans-pro/fonts';
 @import '~npm-font-source-sans-pro/source-sans-pro';
@@ -19,11 +19,23 @@ $FontPathSourceSansPro: '../../node_modules/npm-font-source-sans-pro/fonts';
 }
 
 body {
-  font-family: 'Source Sans Pro';
+  font-family: $main-fonts;
   font-weight: $font-regular;
   color: #000;
 }
 
+#incompatible-browser {
+  display: none;
+  text-align: center;
+  position: absolute;
+  width: 100%;
+  top: 45%;
+}
+
+strong {
+  font-weight: $font-semibold;
+}
+
 input.readonly {
   /* Force blank on readonly inputs */
   background-color: #fff !important;
@@ -118,10 +130,7 @@ label {
 
 // Thanks https://gist.github.com/alexandrevicenzi/680147013e902a4eaa5d
 .glyphicon-refresh-animate {
-  -animation: spin .7s infinite linear;
-  -ms-animation: spin .7s infinite linear;
-  -webkit-animation: spinw .7s infinite linear;
-  -moz-animation: spinm .7s infinite linear;
+  animation: spin .7s infinite linear;
 }
 
 @keyframes spin {
@@ -129,57 +138,48 @@ label {
   to { transform: scale(1) rotate(360deg);}
 }
 
-@-webkit-keyframes spinw {
-  from { -webkit-transform: rotate(0deg);}
-  to { -webkit-transform: rotate(360deg);}
-}
-
-@-moz-keyframes spinm {
-  from { -moz-transform: rotate(0deg);}
-  to { -moz-transform: rotate(360deg);}
-}
-
 // ngprime data table customizations
-p-datatable {
+p-table {
   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;
-    }
+  .ui-table-tbody {
+    tr {
+      &:hover {
+        background-color: #f0f0f0 !important;
+      }
 
-    &:not(:hover) {
-      .action-cell * {
-        display: none !important;
+      &:not(:hover) {
+        .action-cell * {
+          display: none !important;
+        }
+      }
+
+      &:first-child td {
+        border-top: none !important;
       }
-    }
 
-    &:first-child td {
-      border-top: none !important;
+      &:last-child td {
+        border-bottom: none !important;
+      }
     }
 
-    &:last-child td {
-      border-bottom: none !important;
+    .expander {
+      cursor: pointer;
+      position: relative;
+      top: 1px;
     }
   }
 
@@ -191,17 +191,31 @@ p-datatable {
     font-weight: $font-semibold !important;
     color: #000 !important;
 
-    &.ui-sortable-column:hover:not(.ui-state-active) {
+    &.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 {
-      color: #fff !important;
-      background-color: $orange-color !important;
-      border: 1px solid $orange-color !important;
-      border-width: 0 1px !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;
+        }
+      }
     }
   }
 
@@ -258,41 +272,82 @@ p-datatable {
 .modal {
   .modal-header {
     border-bottom: none;
+    margin-bottom: 5px;
+
+    .modal-title {
+      font-size: 20px;
+      font-weight: $font-semibold;
+    }
+
+    .close {
+      @include icon(24px);
 
-    .title-page-single {
-      margin: 0;
+      position: relative;
+      right: -1px;
+      float: right;
+      background-image: url('../assets/images/global/cross.svg');
     }
   }
-}
 
-.nav {
-  font-size: 16px !important;
-  border: none !important;
+  .inputs {
+    margin-top: 40px;
+    margin-bottom: 0;
+    text-align: right;
 
-  .nav-item .nav-link {
-    margin-right: 30px;
-    padding: 0;
-    border-radius: 3px;
-    border: none !important;
+    .action-button-cancel {
+      @include peertube-button;
+      @include grey-button;
 
-    .tab-link {
-      display: flex !important;
-      align-items: center;
-      height: 30px !important;
-      padding: 0 15px;
+      display: inline-block;
+      margin-right: 10px;
     }
 
-    &, & a {
-      color: #000 !important;
-      @include disable-default-a-behaviour;
+    .action-button-submit {
+      @include peertube-button;
+      @include orange-button;
     }
+  }
+}
 
-    &.active, &:hover {
-      background-color: #F0F0F0;
+tabset:not(.bootstrap) {
+  .nav {
+    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;
+      }
+
+      &, & a {
+        color: #000 !important;
+        @include disable-default-a-behaviour;
+      }
+
+      &.active, &:hover {
+        background-color: #F0F0F0;
+      }
+
+      &.active {
+        font-weight: $font-semibold !important;
+      }
     }
+  }
+}
 
-    &.active {
-      font-weight: $font-semibold !important;
+tabset.bootstrap {
+  .nav-item .nav-link {
+    &, & a {
+      color: #000;
+      @include disable-default-a-behaviour;
     }
   }
 }
@@ -317,10 +372,34 @@ p-datatable {
   @include grey-button;
 }
 
+// In tables, don't have a hover different background
+table {
+  .action-button-edit, .action-button-delete {
+    &:hover, &:active, &:focus, &[disabled], &.disabled {
+      background-color: $grey-color !important;
+    }
+  }
+}
+
+@media screen and (max-width: 900px) {
+  .main-col {
+    &, &.expanded {
+      .margin-content {
+        margin-left: 50px;
+        margin-right: 50px;
+      }
+
+      .sub-menu {
+        padding-left: 50px;
+      }
+    }
+  }
+}
+
 // On small screen, menu is absolute
-@media screen and (max-width: 800px) {
+@media screen and (max-width: 600px) {
   .title-menu-left {
-    width: 150px !important;
+    width: 100% !important;
     position: absolute !important;
     z-index: 10000;
   }
@@ -330,12 +409,12 @@ p-datatable {
 
     &, &.expanded {
       .margin-content {
-        margin-left: 10px;
-        margin-right: 10px;
+        margin-left: 15px;
+        margin-right: 15px;
       }
 
       .sub-menu {
-        padding-left: 10px;
+        padding-left: 15px;
         margin-bottom: 10px;
       }
 
@@ -344,4 +423,8 @@ p-datatable {
       }
     }
   }
+
+  bs-dropdown-container {
+    z-index: 10000;
+  }
 }