X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=65711a225fbb4f3bbfd97f5a2050329d2647d271;hb=b2c60abe6e1637d8f55688ffcbf99cf553ed52ea;hp=e7b4024a7dbdc596d642089a706e6590e4ca4f60;hpb=04e0fc488826f505a8de3ce99113f3cb2fcec147;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index e7b4024a7..65711a225 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,20 +1,41 @@
-$FontPathSourceSansPro: "../fonts/source-sans-pro";
-@import '~source-sans-pro/source-sans-pro';
-@import '~primeng/resources/themes/bootstrap/theme.css';
-@import '~primeng/resources/primeng.css';
+@import '_variables';
+@import '_mixins';
+
+$icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/';
+@import '_bootstrap';
+
+@import '_fonts';
+
 @import '~video.js/dist/video-js.css';
-@import './video-js-custom.scss';
+
+$assets-path: '../assets/';
+@import './player/player';
+@import './loading-bar';
+
+@import './primeng-custom';
 
 [hidden] {
   display: none !important;
 }
 
 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;
@@ -90,36 +111,30 @@ label {
   &:hover, &:active, &:focus {
     color: #000;
   }
-}
 
-.admin-sub-title {
-  font-size: 20px;
-  font-weight: bold;
+  @media screen and (max-width: 500px) {
+    margin-right: 20px;
+  }
 }
 
-// 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;
-  }
+.admin-sub-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 30px;
 
-  .main-col {
-    width: 100% !important;
+  .form-sub-title {
+    flex-grow: 1;
   }
+}
 
-  .fake-menu {
-    display: none;
-  }
+.form-sub-title {
+  font-size: 20px;
+  font-weight: bold;
 }
 
 // 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 {
@@ -127,27 +142,6 @@ 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 {
-  .action-cell {
-    text-align: center;
-
-    .glyphicon {
-      cursor: pointer;
-    }
-  }
-}
-
 // Bootstrap customizations
 .dropdown-menu {
   border-radius: 3px;
@@ -166,47 +160,88 @@ 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 {
-  margin-top: 10px;
-  font-size: 16px !important;
-  border: none !important;
+  .inputs {
+    margin-top: 40px;
+    margin-bottom: 0;
+    text-align: right;
 
-  .nav-item .nav-link {
-    height: 30px !important;
-    margin-right: 30px;
-    padding: 0 15px;
-    display: flex;
-    align-items: center;
-    border-radius: 3px;
-    border: none !important;
+    .action-button-cancel {
+      @include peertube-button;
+      @include grey-button;
 
-    &, & a {
-      color: #000 !important;
+      display: inline-block;
+      margin-right: 10px;
     }
 
-    &.active, &:hover {
-      background-color: #F0F0F0;
+    .action-button-submit {
+      @include peertube-button;
+      @include orange-button;
     }
+  }
+}
+
+tabset:not(.bootstrap) {
+  .nav {
+    font-size: 16px !important;
+    border: none !important;
 
-    &.active {
-      font-weight: $font-semibold !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;
+      }
     }
   }
+}
+
+tabset.bootstrap {
+  margin-left: 0;
 
-  .tab-content {
-    min-height: 75px;
-    padding: 15px;
+  .nav-item .nav-link {
+    &, & a {
+      color: #000;
+      @include disable-default-a-behaviour;
+    }
   }
 }
 
-
 .orange-button {
   @include peertube-button;
   @include orange-button;
@@ -226,3 +261,58 @@ p-datatable {
   @include peertube-button-link;
   @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;
+      }
+    }
+  }
+}
+
+@media screen and (max-width: 600px) {
+  .menu-wrapper {
+    width: 100% !important;
+    z-index: 10000;
+  }
+
+  .main-col {
+    margin-left: 0;
+
+    &, &.expanded {
+      .margin-content {
+        margin-left: 15px;
+        margin-right: 15px;
+      }
+
+      .sub-menu {
+        padding-left: 15px;
+        margin-bottom: 10px;
+      }
+
+      input[type=text], input[type=password] {
+        width: 100% !important;
+      }
+    }
+  }
+
+  bs-dropdown-container {
+    z-index: 10000;
+  }
+}