Merge branch 'release/3.1.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / app.component.scss

diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index c95b21ca37ef8fe0346154224111a4585442e4a9..42293e4121b33a11e57646aef48da2c6117b890e 100644 (file)
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -1,5 +1,13 @@
 @import '_variables';
 @import '_mixins';
+@import '~bootstrap/scss/functions';
+@import '~bootstrap/scss/variables';
+
+$assets-path: '../assets';
+
+.peertube-container {
+  padding-bottom: 20px;
+}
 
 .main-row {
   min-height: calc(100vh - #{$header-height} - #{$footer-height} - #{$footer-margin});
@@ -7,7 +15,8 @@
 
 .sub-header-container {
   margin-top: $header-height;
-  background-color: var(--mainBackgroundColor);
+  background-color: pvar(--mainBackgroundColor);
+  width: 100%;
 }
 
 .header {
@@ -15,26 +24,29 @@
   position: fixed;
   top: 0;
   width: 100%;
-  background-color: var(--mainBackgroundColor);
-  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 {
-    z-index: 1001;
+    z-index: 1;
     height: $header-height;
     display: flex;
     align-items: center;
-    flex: 1;
     min-width: 0;
 
     .icon {
       @include icon(24px);
 
       &.icon-menu {
-        background-color: var(--mainForegroundColor);
-        mask-image: url('../assets/images/header/menu.svg');
+        background-color: pvar(--mainForegroundColor);
+        mask-image: url('#{$assets-path}/images/misc/menu.svg');
         margin: 0 18px 0 20px;
+        
+        @media screen and (max-width: $mobile-view) {
+          margin: 0 10px;
+        }
       }
     }
 
@@ -56,23 +68,18 @@
 
       .icon.icon-logo {
         display: inline-block;
-        background: url('../assets/images/logo.svg') no-repeat;
         width: 23px;
         height: 24px;
+        margin-right: .5rem;
       }
     }
 
-    @media screen and (max-width: 500px) {
-      width: 70px;
+    @media screen and (max-width: $mobile-view) {
 
       .peertube-title {
         display: none;
       }
     }
-
-    @media screen and (max-width: 350px) {
-      flex: auto;
-    }
   }
 
   .header-right {
@@ -81,13 +88,42 @@
     align-items: center;
     justify-content: flex-end;
     white-space: nowrap;
+    flex: 1;
   }
 }
 
-footer {
-  padding: 10px 0;
-  font-size: 11px;
-  margin-top: $footer-margin;
-  height: $footer-height;
-  justify-content: center;
+.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;
+  }
+
+  @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;
+    }
+  }
 }