X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.scss;h=a7be8e1afa6af7ca9239e148fb6cce4f839282c9;hb=ece3029bd99a76b3c48a1cc8c58914c5cf61f106;hp=a98e57cc3c609a4c6462960dcf5b088e1719f14a;hpb=1840c2f7c91f5f89602a3683d85b0a9df1454855;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index a98e57cc3..a7be8e1af 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -1,147 +1,93 @@
+@import '_variables';
+@import '_mixins';
+
 .main-row {
   min-height: calc(100vh - #{$header-height} - #{$footer-height} - #{$footer-margin});
 }
 
-.title-menu-left {
-  position: fixed;
-  height: calc(100vh - #{$header-height});
-  padding: 0;
-
-  .title-menu-left-block.menu {
-    height: 100%;
-  }
+.sub-header-container {
+  margin-top: $header-height;
+  background-color: var(--mainBackgroundColor);
 }
 
 .header {
   height: $header-height;
-
-  .fake-title-block {
-    display: inline-block;
-  }
+  position: fixed;
+  top: 0;
+  width: 100%;
+  background-color: var(--mainBackgroundColor);
+  z-index: z(header);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.16);
+  display: flex;
 
   .top-left-block {
-    z-index: 100;
-    background-color: #fff;
-    border-right: 1px solid $header-border-color;
+    z-index: z(headerLeft);
     height: $header-height;
-    line-height: $header-height;
-    margin-top: 0;
-    margin-bottom: 0;
     display: flex;
-    position: fixed;
-    padding: 0;
-
-    &.border-bottom {
-      border-bottom: 1px solid $header-border-color;
-    }
+    align-items: center;
+    min-width: 0;
 
-    .hamburger-block {
-      margin-right: 15px;
-      margin-left: 15px;
+    .icon {
+      @include icon(24px);
 
-      .glyphicon {
-        cursor: pointer;
-        position: relative;
-        top: 4px;
+      &.icon-menu {
+        background-color: var(--mainForegroundColor);
+        mask-image: url('../assets/images/header/menu.svg');
+        margin: 0 18px 0 20px;
       }
     }
 
-    #peertube-title {
-
-      a {
-        color: inherit !important;
-        display: block;
-        background: url(/assets/logo.png) no-repeat;
-        background-size: contain;
-        background-position: center;
-        height: 100%;
-        margin: auto;
-        width: 135px;
-
-        &:hover {
-          color: inherit !important;
-          text-decoration: none !important;
-        }
-      }
-    }
-
-    @media screen and (max-width: 500px) {
-      #peertube-title {
-        display: none;
-      }
-
-      .hamburger-block {
-        width: 100%;
-        text-align: center;
-      }
-    }
+    .peertube-title {
+      @include disable-default-a-behaviour;
 
-    @media screen and (min-width: 500px) and (max-width: 600px) {
-      #peertube-title a {
-        width: 80px;
-      }
-    }
+      font-size: 20px;
+      font-weight: $font-bold;
+      color: inherit !important;
+      display: flex;
+      align-items: center;
+      overflow: hidden;
 
-    @media screen and (min-width: 600px) and (max-width: 700px) {
-      #peertube-title a {
-        width: 100px;
-      }
-    }
+      .instance-name {
+        @include ellipsis;
 
-    @media screen and (min-width: 1000px) {
-      #peertube-title a {
-        width: 120px;
+        width: 100%;
       }
-    }
 
-    @media screen and (min-width: 1000px) {
-      #peertube-title a {
-        width: 120px;
+      .icon.icon-logo {
+        display: inline-block;
+        background: url('../assets/images/logo.svg') no-repeat;
+        width: 23px;
+        height: 24px;
       }
     }
 
-    @media screen and (min-width: 1200px) {
-      padding-left: 15px;
-
-      .hamburger-block {
-        margin-right: 15px;
-      }
+    @media screen and (max-width: $mobile-view) {
+      width: 70px;
 
-      #peertube-title a {
-        width: 135px;
+      .peertube-title {
+        display: none;
       }
     }
 
-    @media screen and (min-width: 1600px) {
-      .hamburger-block {
-        margin-right: 20px;
-      }
-
-      #peertube-title a {
-        width: 180px;
-      }
+    @media screen and (max-width: 350px) {
+      flex: auto;
     }
   }
 
-  my-search {
-    position: fixed;
-    z-index: 1000;
-    // Fix col-md-* padding
-    padding: 0;
-  }
-
-  .search-col {
-    height: 100%;
-    margin-left: -15px;
-    padding: 0;
+  .header-right {
+    height: $header-height;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    white-space: nowrap;
+    flex: 1;
   }
 }
 
 footer {
-  border-top: 1px solid $footer-border-color;
   padding: 10px 0;
-  text-align: center;
   font-size: 11px;
   margin-top: $footer-margin;
   height: $footer-height;
+  justify-content: center;
 }