X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.scss;h=38ec11b5bd980fc0f03758be1f456318c667b7ca;hb=caf2aaf4f9d38ad441a5562c3b8720f8779d6f78;hp=f245d05631e6ab81ffd6b69664f9356cfb6f5f08;hpb=26c6ee80d0fecfce595e8970f15717560b4f4ceb;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index f245d0563..38ec11b5b 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -1,28 +1,20 @@
-.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;
+.peertube-container {
+  padding-bottom: 20px;
+}
 
-  &.expanded {
-    margin-left: 0;
-  }
+.main-row {
+  min-height: calc(100vh - #{$header-height} - #{$footer-height} - #{$footer-margin});
 }
 
 .sub-header-container {
   margin-top: $header-height;
-}
-
-.title-menu-left {
-  position: fixed;
-  height: calc(100vh - #{$header-height});
-  padding: 0;
-  width: $menu-width;
-
-  .title-menu-left-block.menu {
-    height: 100%;
-  }
+  background-color: pvar(--mainBackgroundColor);
+  width: 100%;
 }
 
 .header {
@@ -30,69 +22,108 @@
   position: fixed;
   top: 0;
   width: 100%;
-  background-color: #fff;
-  z-index: 1000;
+  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;
     display: flex;
     align-items: center;
+    min-width: 0;
 
     .icon {
-      cursor: pointer;
-      width: 22px;
-      height: 22px;
-      display: inline-block;
-      background-size: contain;
+      @include icon(24px);
 
       &.icon-menu {
-        background-image: url('../assets/header/menu.svg');
-        margin: 0 18px 0 24px;
+        background-color: pvar(--mainForegroundColor);
+        mask-image: url('../assets/images/misc/menu.svg');
+        margin: 0 18px 0 20px;
       }
     }
 
-    #peertube-title {
+    .peertube-title {
+      @include disable-default-a-behaviour;
+
       font-size: 20px;
       font-weight: $font-bold;
       color: inherit !important;
       display: flex;
       align-items: center;
+      overflow: hidden;
 
-      @include disable-default-a-behaviour;
+      .instance-name {
+        @include ellipsis;
+
+        width: 100%;
+      }
 
       .icon.icon-logo {
         display: inline-block;
-        background: url('../assets/logo.svg') no-repeat;
-        width: 20px;
+        background-repeat: no-repeat;
+        width: 23px;
         height: 24px;
+        margin-right: .5rem;
       }
     }
 
-    @media screen and (max-width: 500px) {
-      #peertube-title {
+    @media screen and (max-width: $mobile-view) {
+      width: 70px;
+
+      .peertube-title {
         display: none;
       }
     }
+
+    @media screen and (max-width: 350px) {
+      flex: auto;
+    }
   }
 
   .header-right {
     height: $header-height;
     display: flex;
     align-items: center;
-    flex-grow: 1;
     justify-content: flex-end;
+    white-space: nowrap;
+    flex: 1;
   }
 }
 
-footer {
-  border-top: 1px solid $footer-border-color;
-  padding: 10px 0;
+.broadcast-message {
+  min-height: 50px;
   text-align: center;
-  font-size: 11px;
-  margin-top: $footer-margin;
-  height: $footer-height;
+  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;
+  }
+
+  @each $color, $value in $theme-colors {
+    &.alert-#{$color} {
+      my-global-icon {
+        @include apply-svg-color(theme-color-level($color, $alert-color-level));
+      }
+    }
+  }
+
+  ::ng-deep {
+    p {
+      font-size: 16px;
+    }
+
+    p:last-child {
+      margin-bottom: 0;
+    }
+  }
 }