X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.scss;h=a699da12fc16e5cac374125142e0e37197d4e248;hb=8ff3f88347cb733ca8a3978ba6eb9763fb3ea294;hp=2c21067334ceb67663598dce4349a9d30b40bd15;hpb=26c6ee80d0fecfce595e8970f15717560b4f4ceb;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 2c2106733..a699da12f 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -1,16 +1,29 @@
+@import '_variables';
+@import '_mixins';
+
+.menu-wrapper {
+  position: fixed;
+  height: calc(100vh - #{$header-height});
+  padding: 0;
+  width: $menu-width;
+  z-index: 10000;
+}
+
 menu {
-  background-color: $black-background;
+  background-color: $menu-background;
   margin: 0;
   padding: 0;
   height: 100%;
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
-  z-index: 1000;
   color: $menu-color;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
 
-  @media screen and (max-width: 550px) {
-    font-size: 90%;
+  &:focus, &:hover {
+    overflow-y: auto;
   }
 
   .logged-in-block {
@@ -21,18 +34,32 @@ menu {
     justify-content: center;
     margin-bottom: 35px;
 
+    img {
+      @include avatar(34px);
+
+      margin-left: 20px;
+      margin-right: 10px;
+    }
+
     .logged-in-info {
       flex-grow: 1;
-      margin-left: 40px;
 
       .logged-in-username {
         font-size: 16px;
         font-weight: $font-semibold;
+        color: $menu-color;
+        cursor: pointer;
+
+        @include disable-default-a-behaviour;
       }
 
       .logged-in-email {
         font-size: 13px;
         color: #C6C6C6;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        max-width: 140px;
       }
     }
 
@@ -42,6 +69,10 @@ menu {
       .glyphicon {
         cursor: pointer;
         font-size: 18px;
+
+        &::after {
+          border: none;
+        }
       }
     }
   }
@@ -49,22 +80,26 @@ menu {
   .button-block {
     margin: 30px 25px 35px 25px;
 
-    .login-button, .create-account-button {
-      font-weight: $font-semibold;
-      font-size: 15px;
-      height: $button-height;
-      line-height: $button-height;
-      width: 190px;
-      border-radius: 3px;
-      text-align: center;
-
-      &.login-button {
-        background-color: $orange-color;
-        margin-bottom: 10px;
-      }
+    .login-button {
+      @include peertube-button-link;
+      @include orange-button;
+
+      display: block;
+      width: 100%;
+      margin-bottom: 10px;
+    }
+
+    .create-account-button {
+      @include peertube-button-link;
 
-      &.create-account-button {
-        background-color: rgba(255, 255, 255, 0.25);
+      display: block;
+      width: 100%;
+
+      color: #fff;
+      background-color: rgba(255, 255, 255, 0.25);
+
+      &:hover {
+        background-color: rgba(255, 255, 255, 0.28);
       }
     }
   }
@@ -74,55 +109,130 @@ menu {
     font-weight: $font-bold; // Bold
     font-size: 13px;
     margin-bottom: 25px;
+    margin-left: 26px;
   }
 
   .panel-block {
     margin-bottom: 45px;
-    margin-left: 26px;
 
     a {
       display: flex;
+      align-items: center;
+      padding-left: $menu-left-padding;
+      color: $menu-color;
+      cursor: pointer;
+      height: 40px;
+      font-size: 16px;
+      transition: background-color .1s ease-in-out;
+      @include disable-default-a-behaviour;
+
+      &:hover {
+        background-color: rgba(255, 255, 255, 0.15);
+      }
 
       .icon {
-        width: 22px;
-        height: 22px;
-        display: inline-block;
+        @include icon(22px);
+
         margin-right: 18px;
-        background-size: contain;
+
+        &.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;
-          background-image: url('../../assets/menu/trending.svg');
+          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');
+        }
+
+        &.icon-videos-local {
+          width: 23px;
+          height: 23px;
+
           position: relative;
           top: -1px;
-          background-image: url('../../assets/menu/recently-added.svg');
+
+          background-image: url('../../assets/images/menu/home.svg');
         }
 
         &.icon-administration {
           width: 23px;
           height: 23px;
 
-          background-image: url('../../assets/menu/administration.svg');
+          background-image: url('../../assets/images/menu/administration.svg');
+        }
+
+        &.icon-about  {
+          width: 23px;
+          height: 23px;
+
+          background-image: url('../../assets/images/menu/about.svg');
         }
       }
     }
   }
 
-  a {
-    color: $menu-color;
-    height: 22px;
-    line-height: 22px;
-    display: block;
-    font-size: 16px;
-    cursor: pointer;
-    margin-bottom: 15px;
+  .footer {
+    padding-bottom: 15px;
+    padding-left: $menu-left-padding;
+
+    .language, .color-palette {
+      display: inline-block;
+      color: $menu-bottom-color;
+      cursor: pointer;
+      font-size: 12px;
+      font-weight: $font-semibold;
+
+      .icon {
+        @include icon(28px);
+        opacity: 0.9;
+
+        &.icon-language  {
+          position: relative;
+          top: -1px;
+          width: 28px;
+          height: 24px;
+
+          background-image: url('../../assets/images/menu/language.png');
+        }
+
+        &.icon-moonsun  {
+          margin-left: 10px;
+          position: relative;
+          top: -1px;
+          width: 24px;
+          height: 24px;
+
+          background-image: url('../../assets/images/menu/moonsun.svg');
+        }
+
+        &:hover {
+          opacity: 1;
+        }
+      }
+    }
+  }
+}
+
+@media screen and (max-width: 400px) {
+  .menu-wrapper {
+    width: 100% !important;
+  }
 
-    @include disable-default-a-behaviour;
+  .top-menu {
+    width: 100%;
   }
 }