X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.scss;h=4a32ad2d7ab83492532204ed64ac5ff1171dfe0b;hb=8cbc40b2fe9d36ef0505b9441276ca561342e9e9;hp=7259006e5a1ae2571e9379284bcbbb4e28121617;hpb=174d46578bb719c85686f9bb89abf4330ae4cac1;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index 7259006e5..4a32ad2d7 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -1,147 +1,117 @@
+@use '_variables' as *;
+@use '_mixins' as *;
+
+.peertube-container {
+  padding-bottom: 20px;
+}
+
 .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: pvar(--mainBackgroundColor);
+  width: 100%;
 }
 
 .header {
   height: $header-height;
+  position: fixed;
+  top: 0;
+  width: 100%;
+  background-color: pvar(--mainBackgroundColor);
+  z-index: z(header);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.16);
+  display: flex;
+}
 
-  .fake-title-block {
-    display: inline-block;
+.top-left-block {
+  z-index: 1;
+  height: $header-height;
+  display: flex;
+  align-items: center;
+  min-width: 0;
+
+  .icon {
+    @include icon(24px);
   }
 
-  .top-left-block {
-    z-index: 100;
-    background-color: #fff;
-    border-right: 1px solid $header-border-color;
-    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;
-    }
+  .icon-menu {
+    mask-image: url('../assets/images/misc/menu.svg');
+    -webkit-mask-image: url('../assets/images/misc/menu.svg');
 
-    .hamburger-block {
-      margin-right: 15px;
-      margin-left: 15px;
+    background-color: pvar(--mainForegroundColor);
+    margin: 0 18px 0 20px;
 
-      .glyphicon {
-        cursor: pointer;
-        position: relative;
-        top: 4px;
-      }
+    @media screen and (max-width: $mobile-view) {
+      margin: 0 10px;
     }
+  }
+}
 
-    #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;
-        }
-      }
-    }
+.header-right {
+  height: $header-height;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  white-space: nowrap;
+  flex: 1;
+}
 
-    @media screen and (max-width: 500px) {
-      #peertube-title {
-        display: none;
-      }
+.peertube-title {
+  @include disable-default-a-behaviour;
 
-      .hamburger-block {
-        width: 100%;
-        text-align: center;
-      }
-    }
+  font-size: 20px;
+  font-weight: $font-bold;
+  color: inherit !important;
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  padding: 0 0 0 10px;
 
-    @media screen and (min-width: 500px) and (max-width: 600px) {
-      #peertube-title a {
-        width: 80px;
-      }
-    }
+  .instance-name {
+    @include ellipsis;
 
-    @media screen and (min-width: 600px) and (max-width: 700px) {
-      #peertube-title a {
-        width: 100px;
-      }
-    }
+    width: 100%;
 
-    @media screen and (min-width: 1000px) {
-      #peertube-title a {
-        width: 120px;
-      }
+    @media screen and (max-width: $mobile-view) {
+      display: none;
     }
+  }
 
-    @media screen and (min-width: 1000px) {
-      #peertube-title a {
-        width: 120px;
-      }
-    }
+  .icon.icon-logo {
+    @include margin-right(0.5rem);
 
-    @media screen and (min-width: 1200px) {
-      padding-left: 15px;
+    display: inline-block;
+    width: 23px;
+    height: 24px;
+  }
+}
 
-      .hamburger-block {
-        margin-right: 15px;
-      }
+.broadcast-message {
+  min-height: 50px;
+  text-align: center;
+  margin-bottom: 0;
+  border-radius: 0;
+  display: grid;
+  grid-template-columns: 1fr 30px;
+  column-gap: 10px;
+
+  my-global-icon {
+    justify-self: center;
+    align-self: center;
+    cursor: pointer;
+    width: 20px;
+  }
 
-      #peertube-title a {
-        width: 135px;
-      }
+  ::ng-deep {
+    p {
+      font-size: 16px;
     }
 
-    @media screen and (min-width: 1600px) {
-      .hamburger-block {
-        margin-right: 20px;
-      }
-
-      #peertube-title a {
-        width: 180px;
-      }
+    p:last-child {
+      margin-bottom: 0;
     }
   }
-
-  my-search {
-    position: fixed;
-    z-index: 1000;
-    // Fix col-md-* padding
-    padding: 0;
-  }
-
-  .search-col {
-    height: 100%;
-    margin-left: -15px;
-    padding: 0;
-  }
-}
-
-footer {
-  border-top: 1px solid $footer-border-color;
-  padding: 10px 0;
-  text-align: center;
-  font-size: 11px;
-  margin-top: $footer-margin;
-  height: $footer-height;
 }