X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.scss;h=407d79725c57290c25c0d2453473a5527ec3e29d;hb=c41c0e28ed444fdb427f9803d2f123ba6f535fb9;hp=fc5110edae29ac5abcc98f6942b0f0e40066286b;hpb=66467298e636875c1d1016902a98624adf8bc242;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index fc5110eda..407d79725 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -6,18 +6,19 @@
   height: calc(100vh - #{$header-height});
   padding: 0;
   width: $menu-width;
-  z-index: 10000;
+  z-index: z(menu);
+  scrollbar-color: pvar(--actionButtonColor) pvar(--menuBackgroundColor);
 }
 
 menu {
-  background-color: $menu-background;
+  @include ellipsis;
+
+  background-color: pvar(--menuBackgroundColor);
   margin: 0;
   padding: 0;
   height: 100%;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  color: $menu-color;
+  overflow-x: hidden;
+  color: pvar(--menuForegroundColor);
   display: flex;
   flex-direction: column;
   width: 100%;
@@ -26,8 +27,23 @@ menu {
     overflow-y: auto;
   }
 
+  @media not all and (hover: hover) and (pointer: fine) {
+    overflow-y: auto;
+  }
+
+  &.logged-in {
+    .panel-block {
+      margin-bottom: 20px;
+    }
+
+    .block-title {
+      margin-bottom: 15px;
+    }
+  }
+
   .top-menu {
     flex-grow: 1;
+    width: $menu-width;
   }
 
   .logged-in-block {
@@ -36,47 +52,45 @@ menu {
     display: flex;
     align-items: center;
     justify-content: center;
-    margin-bottom: 35px;
-
-    img {
-      @include avatar(34px);
-
-      margin-left: 20px;
-      margin-right: 10px;
-    }
+    margin-bottom: 20px;
 
     .logged-in-info {
+      @include ellipsis;
+
       flex-grow: 1;
 
-      .logged-in-username {
+      .logged-in-display-name {
         font-size: 16px;
         font-weight: $font-semibold;
-        color: $menu-color;
+        color: pvar(--menuForegroundColor);
         cursor: pointer;
 
         @include disable-default-a-behaviour;
       }
 
-      .logged-in-email {
+      .logged-in-username {
+        @include ellipsis;
+
         font-size: 13px;
         color: #C6C6C6;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
         max-width: 140px;
+        cursor: pointer;
       }
     }
 
     .logged-in-more {
       margin-right: 20px;
 
-      .glyphicon {
+      my-global-icon.dropdown-toggle {
         cursor: pointer;
-        font-size: 18px;
 
         &::after {
           border: none;
         }
+
+        ::ng-deep {
+          @include apply-svg-color(pvar(--menuForegroundColor));
+        }
       }
     }
   }
@@ -117,126 +131,227 @@ menu {
   }
 
   .panel-block {
-    margin-bottom: 45px;
+    margin-bottom: 15px;
 
     a {
+      @include disable-default-a-behaviour;
+
       display: flex;
       align-items: center;
-      padding-left: $menu-left-padding;
-      color: $menu-color;
+      padding-left: $menu-lateral-padding;
+      color: pvar(--menuForegroundColor);
       cursor: pointer;
-      height: 40px;
+      min-height: 40px;
       font-size: 16px;
       transition: background-color .1s ease-in-out;
-      @include disable-default-a-behaviour;
+      white-space: normal;
+      word-break: break-word;
+      padding-right: 20px;
 
-      &:hover {
+      &.active {
         background-color: rgba(255, 255, 255, 0.15);
       }
 
-      .icon {
-        @include icon(22px);
+      &:hover, &.focus-visible {
+        background-color: rgba(255, 255, 255, 0.10);
+      }
+
+      my-global-icon {
+        @include apply-svg-color(#808080);
 
+        display: flex;
+        width: 22px;
+        height: 22px;
         margin-right: 18px;
 
-        &.icon-videos-subscriptions {
-          position: relative;
-          top: -1px;
-          background-image: url('../../assets/images/menu/subscriptions.svg');
-        }
+        &[iconName="playlists"] {
+          height: 24px;
+          width: 24px;
 
-        &.icon-videos-overview {
-          position: relative;
-          background-image: url('../../assets/images/menu/globe.svg');
+          margin-right: 16px;
         }
 
-        &.icon-videos-trending {
+        &[iconName="videos"] {
           position: relative;
-          top: -1px;
-          background-image: url('../../assets/images/menu/trending.svg');
-        }
-
-        &.icon-videos-recently-added {
-          width: 23px;
-          height: 23px;
-          background-image: url('../../assets/images/menu/recently-added.svg');
+          right: -1px;
         }
+      }
 
-        &.icon-videos-local {
-          width: 23px;
-          height: 23px;
+      .icon {
+        @include icon(22px);
 
-          position: relative;
-          top: -1px;
+        margin-right: 18px;
+      }
+    }
+  }
 
-          background-image: url('../../assets/images/menu/home.svg');
-        }
+  .footer {
+    width: $menu-width;
+    padding-bottom: 15px;
 
-        &.icon-administration {
-          width: 23px;
-          height: 23px;
+    .bottom-links {
+      display: flex;
+      flex-direction: column;
+      padding: 0 $menu-lateral-padding;
+    }
 
-          background-image: url('../../assets/images/menu/administration.svg');
-        }
+    $footer-links-base-opacity: .8;
 
-        &.icon-about  {
-          width: 23px;
-          height: 23px;
+    .footer-links {
+      &, > div {
+        display: flex;
+        flex-wrap: wrap;
+      }
 
-          background-image: url('../../assets/images/menu/about.svg');
+      a, span[role=button] {
+        display: inline-block;
+        text-decoration: none;
+        color: pvar(--mainBackgroundColor);
+        opacity: $footer-links-base-opacity;
+        white-space: nowrap;
+        font-size: 90%;
+        font-weight: 500;
+        line-height: 1.4rem;
+        margin-right: 8px;
+
+        &.inline-global-icon {
+          display: inline-flex;
+          align-items: center;
+          white-space: nowrap;
+          height: 1.4rem;
+
+          my-global-icon {
+            @include apply-svg-color(pvar(--mainBackgroundColor));
+
+            display: flex;
+            width: auto;
+            height: 90%;
+            margin-right: .2rem;
+          }
         }
       }
     }
-  }
 
-  .footer {
-    padding-bottom: 15px;
-    padding-left: $menu-left-padding;
+    .footer-copyleft small a {
+      @include disable-default-a-behaviour;
 
-    .language, .color-palette {
-      display: inline-block;
-      color: $menu-bottom-color;
-      cursor: pointer;
-      font-size: 12px;
-      font-weight: $font-semibold;
+      color: pvar(--mainBackgroundColor);
+      opacity: $footer-links-base-opacity - .2;
+    }
+  }
+}
 
-      .icon {
-        @include icon(28px);
-        opacity: 0.9;
+.dropdown-menu {
+  width: calc(100% + 40px);
+}
 
-        &.icon-language  {
-          position: relative;
-          top: -1px;
-          width: 28px;
-          height: 24px;
+.dropdown-item {
+  @include dropdown-with-icon-item;
 
-          background-image: url('../../assets/images/menu/language.png');
-        }
+  cursor: pointer;
+  display: flex;
+  align-items: center;
 
-        &.icon-moonsun  {
-          margin-left: 10px;
-          position: relative;
-          top: -1px;
-          width: 24px;
-          height: 24px;
+  i.glyphicon-menu-right {
+    opacity: .4;
+  }
 
-          background-image: url('../../assets/images/menu/moonsun.svg');
-        }
+  my-global-icon {
+    &[iconName="cog"],
+    &[iconName="sign-out"] {
+      position: relative;
+      right: -2px;
+      height: 20px;
+      width: 20px;
+    }
+  }
 
-        &:hover {
-          opacity: 1;
-        }
-      }
+  my-global-icon.not-displayed {
+    display: none;
+  }
+
+  &:hover {
+    my-global-icon.hover-display-toggle.not-displayed {
+      display: inherit;
+    }
+    my-global-icon.hover-display-toggle {
+      display: none;
     }
   }
 }
 
-@media screen and (max-width: 400px) {
+.more-settings {
+  text-transform: uppercase;
+  font-size: 80%;
+  color: #6c757d;
+}
+
+.icon {
+  @include disable-outline;
+  @include icon(22px);
+  opacity: 0.8;
+
+  &.icon-shortcuts  {
+    position: relative;
+    top: -1px;
+    margin-right: 10px;
+
+    background-image: url('../../assets/images/misc/keyboard.png');
+  }
+}
+
+input[type=checkbox]{
+  position: absolute;
+  visibility: hidden;
+}
+
+label {
+  cursor: pointer;
+  text-indent: -9999px;
+  width: 35px;
+  height: 20px;
+  background: #cccccc;
+  display: block;
+  border-radius: 100px;
+  position: relative;
+  margin: 0;
+
+  &:after {
+    content: '';
+    position: absolute;
+    top: 3px;
+    left: 3px;
+    width: 14px;
+    height: 14px;
+    background: pvar(--mainBackgroundColor);
+    border-radius: 50%;
+    transition: 0.3s ease-out;
+  }
+
+  &:active:after {
+    width: 40px;
+  }
+}
+
+input:checked + label {
+  background: pvar(--mainColor);
+
+  &:after {
+    left: calc(100% - 3px);
+    transform: translateX(-100%);
+  }
+}
+
+@media screen and (max-width: $mobile-view) {
   .menu-wrapper {
     width: 100% !important;
+
+    menu {
+      overflow-y: auto;
+    }
   }
 
-  .top-menu {
-    width: 100%;
+  .top-menu, .footer {
+    width: 100% !important;
   }
 }