X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.scss;h=e8447719aa910b5729af833f0014c2bb5e6b1eee;hb=a5a69fc727c819b106210918b9adce30449932d6;hp=28e86097cc0e54476ba48598de21344bcc0b5346;hpb=b33f657c304b77938c1f68164d8e754787f5aae5;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index 28e86097c..e8447719a 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -1,143 +1,130 @@
-.main-row {
-  min-height: calc(100vh - #{$header-height} - #{$footer-height} - #{$footer-margin});
-}
+@import '_variables';
+@import '_mixins';
+@import '~bootstrap/scss/functions';
+@import '~bootstrap/scss/variables';
 
-.main-col {
-  margin-left: $menu-width;
+$assets-path: '../assets';
 
-  &.expanded {
-    margin-left: 0;
-  }
+.peertube-container {
+  padding-bottom: 20px;
 }
 
-.sub-header-container {
-  margin-top: $header-height;
+.main-row {
+  min-height: calc(100vh - #{$header-height} - #{$footer-height} - #{$footer-margin});
 }
 
-.title-menu-left {
-  position: fixed;
-  height: calc(100vh - #{$header-height});
-  padding: 0;
-  width: $menu-width;
-
-  .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: #fff;
+  background-color: pvar(--mainBackgroundColor);
+  z-index: z(header);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.16);
   display: flex;
 
   .top-left-block {
-    width: $menu-width;
-    z-index: 1001;
+    z-index: 1;
     height: $header-height;
-    line-height: $header-height;
-    margin-top: 0;
-    margin-bottom: 0;
     display: flex;
-    padding: 0;
+    align-items: center;
+    min-width: 0;
 
-    .hamburger-block {
-      margin-right: 10px;
-      margin-left: 25px;
+    .icon {
+      @include icon(24px);
 
-      .glyphicon {
-        cursor: pointer;
+      &.icon-menu {
+        background-color: pvar(--mainForegroundColor);
+        mask-image: url('#{$assets-path}/images/misc/menu.svg');
+        margin: 0 18px 0 20px;
       }
     }
 
-    #peertube-title {
-      a {
-        color: inherit !important;
-        display: block;
-        background: url('../assets/logo.svg') no-repeat;
-        width: 24px;
-        height: 24px;
+    .peertube-title {
+      @include disable-default-a-behaviour;
 
-        &:hover {
-          color: inherit !important;
-          text-decoration: none !important;
-        }
-      }
-    }
+      font-size: 20px;
+      font-weight: $font-bold;
+      color: inherit !important;
+      display: flex;
+      align-items: center;
+      overflow: hidden;
 
-    @media screen and (max-width: 500px) {
-      #peertube-title {
-        display: none;
-      }
+      .instance-name {
+        @include ellipsis;
 
-      .hamburger-block {
         width: 100%;
-        text-align: center;
       }
-    }
 
-    @media screen and (min-width: 500px) and (max-width: 600px) {
-      #peertube-title a {
-        width: 80px;
+      .icon.icon-logo {
+        display: inline-block;
+        width: 23px;
+        height: 24px;
+        margin-right: .5rem;
       }
     }
 
-    @media screen and (min-width: 600px) and (max-width: 700px) {
-      #peertube-title a {
-        width: 100px;
-      }
-    }
+    @media screen and (max-width: $mobile-view) {
+      width: 70px;
 
-    @media screen and (min-width: 1000px) {
-      #peertube-title a {
-        width: 120px;
+      .peertube-title {
+        display: none;
       }
     }
 
-    @media screen and (min-width: 1000px) {
-      #peertube-title a {
-        width: 120px;
-      }
+    @media screen and (max-width: 350px) {
+      flex: auto;
     }
+  }
 
-    @media screen and (min-width: 1200px) {
-      padding-left: 15px;
+  .header-right {
+    height: $header-height;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    white-space: nowrap;
+    flex: 1;
+  }
+}
 
-      .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;
+  @each $color, $value in $theme-colors {
+    &.alert-#{$color} {
+      my-global-icon {
+        @include apply-svg-color(theme-color-level($color, $alert-color-level));
       }
     }
+  }
 
-    @media screen and (min-width: 1600px) {
-      .hamburger-block {
-        margin-right: 20px;
-      }
-
-      #peertube-title a {
-        width: 180px;
-      }
+  ::ng-deep {
+    p {
+      font-size: 16px;
     }
-  }
 
-  .header-right {
-    text-align: right;
-    height: $header-height;
-    margin-left: $menu-width;
-    flex-grow: 1;
+    p:last-child {
+      margin-bottom: 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;
-}