X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.scss;h=137df6fc1a92d45aaf9b3bc5530f7aa2d9e9ae07;hb=ef80c66cea945d315336251dbb5efcb06c64189d;hp=e61f4acd33fbce7e3e167c46777f1d8a18af6a37;hpb=8afc19a6121569da054462c7cb351a3f13030a32;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index e61f4acd3..137df6fc1 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -6,24 +6,29 @@
   height: calc(100vh - #{$header-height});
   padding: 0;
   width: $menu-width;
+  z-index: 10000;
 }
 
 menu {
-  background-color: $black-background;
+  @include ellipsis;
+
+  background-color: var(--menuBackgroundColor);
   margin: 0;
   padding: 0;
   height: 100%;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  z-index: 1000;
-  color: $menu-color;
-  overflow-y: auto;
+  overflow: auto;
+  color: var(--menuForegroundColor);
   display: flex;
   flex-direction: column;
+  width: 100%;
+
+  &:focus, &:hover {
+    overflow-y: auto;
+  }
 
   .top-menu {
     flex-grow: 1;
+    width: $menu-width;
   }
 
   .logged-in-block {
@@ -34,31 +39,25 @@ menu {
     justify-content: center;
     margin-bottom: 35px;
 
-    img {
-      @include avatar(34px);
-
-      margin-left: 20px;
-      margin-right: 10px;
-    }
-
     .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: var(--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;
       }
     }
@@ -69,6 +68,10 @@ menu {
       .glyphicon {
         cursor: pointer;
         font-size: 18px;
+
+        &::after {
+          border: none;
+        }
       }
     }
   }
@@ -114,42 +117,57 @@ menu {
     a {
       display: flex;
       align-items: center;
-      padding-left: $menu-left-padding;
-      color: $menu-color;
+      padding-left: $menu-lateral-padding;
+      color: var(--menuForegroundColor);
       cursor: pointer;
       height: 40px;
       font-size: 16px;
       transition: background-color .1s ease-in-out;
       @include disable-default-a-behaviour;
 
-      &:hover {
+      &.active {
         background-color: rgba(255, 255, 255, 0.15);
       }
 
+      &:hover, &.focus-visible {
+        background-color: rgba(255, 255, 255, 0.10);
+      }
+
       .icon {
         @include icon(22px);
 
         margin-right: 18px;
 
+        &.icon-videos-subscriptions {
+          position: relative;
+          top: -1px;
+          background-image: url('../../assets/images/menu/subscriptions.svg');
+        }
+
+        &.icon-videos-overview {
+          position: relative;
+          background-image: url('../../assets/images/menu/globe.svg');
+        }
+
         &.icon-videos-trending {
           position: relative;
-          top: -2px;
+          top: -1px;
           background-image: url('../../assets/images/menu/trending.svg');
         }
 
         &.icon-videos-recently-added {
           width: 23px;
           height: 23px;
-          position: relative;
-          top: -1px;
           background-image: url('../../assets/images/menu/recently-added.svg');
         }
 
         &.icon-videos-local {
           width: 23px;
           height: 23px;
+
           position: relative;
           top: -1px;
+
           background-image: url('../../assets/images/menu/home.svg');
         }
 
@@ -171,10 +189,12 @@ menu {
   }
 
   .footer {
-    margin-bottom: 15px;
-    padding-left: $menu-left-padding;
+    padding-bottom: 15px;
+    padding-left: $menu-lateral-padding;
+    padding-right: $menu-lateral-padding;
+    width: $menu-width;
 
-    .language {
+    .language, .shortcuts, .color-palette {
       display: inline-block;
       color: $menu-bottom-color;
       cursor: pointer;
@@ -182,6 +202,7 @@ menu {
       font-weight: $font-semibold;
 
       .icon {
+        @include disable-outline;
         @include icon(28px);
         opacity: 0.9;
 
@@ -194,6 +215,27 @@ menu {
           background-image: url('../../assets/images/menu/language.png');
         }
 
+        &.icon-shortcuts  {
+          position: relative;
+          top: -1px;
+          width: 24px;
+          height: 24px;
+
+          background-image: url('../../assets/images/menu/keyboard.png');
+          background-color: #fff;
+          filter: invert(100%);
+        }
+
+        &.icon-moonsun  {
+          margin-left: 10px;
+          position: relative;
+          top: -1px;
+          width: 24px;
+          height: 24px;
+
+          background-image: url('../../assets/images/menu/moonsun.svg');
+        }
+
         &:hover {
           opacity: 1;
         }
@@ -201,3 +243,13 @@ menu {
     }
   }
 }
+
+@media screen and (max-width: $mobile-view) {
+  .menu-wrapper {
+    width: 100% !important;
+  }
+
+  .top-menu, .footer {
+    width: 100% !important;
+  }
+}