X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.scss;h=89dc26e8737acd52d02dacdb831f0d8512f3564b;hb=51a83970061b4005343d2bfc4edb883318ef2ca6;hp=69704674aa5a9a9a90c1787417f86eb5da250631;hpb=98d33a03d3a86aad709e2cd39a4e4d8bac6b7664;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 69704674a..89dc26e87 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -1,109 +1,289 @@
 @import '_variables';
 @import '_mixins';
 
+$menu-link-icon-size: 22px;
+$menu-link-icon-margin-right: 18px;
+
+@mixin menu-link {
+  display: flex;
+  align-items: center;
+  padding-left: $menu-lateral-padding;
+  color: pvar(--menuForegroundColor);
+  cursor: pointer;
+  font-size: 16px;
+  white-space: normal;
+  word-break: break-word;
+  padding-right: 20px;
+  transition: background-color .1s ease-in-out;
+
+  &.active {
+    background-color: rgba(255, 255, 255, 0.15);
+  }
+
+  &:hover, &.focus-visible {
+    background-color: rgba(255, 255, 255, 0.10);
+  }
+
+  my-global-icon {
+    @include apply-svg-color(#808080);
+
+    display: flex;
+    width: $menu-link-icon-size;
+    height: $menu-link-icon-size;
+    margin-right: $menu-link-icon-margin-right;
+  }
+}
+
 .menu-wrapper {
   position: fixed;
   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: var(--menuBackgroundColor);
-  margin: 0;
-  padding: 0;
-  height: 100%;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: auto;
-  color: var(--menuForegroundColor);
+  @include ellipsis;
+
+  background-color: pvar(--menuBackgroundColor);
+  color: pvar(--menuForegroundColor);
+
   display: flex;
   flex-direction: column;
+  height: 100%;
   width: 100%;
+  margin: 0;
+  padding: 0;
 
   &:focus, &:hover {
     overflow-y: auto;
   }
 
-  .top-menu {
-    flex-grow: 1;
-    width: $menu-width;
+  @media not all and (hover: hover) and (pointer: fine) {
+    overflow-y: auto;
   }
 
-  .logged-in-block {
-    height: 100px;
-    background-color: rgba(255, 255, 255, 0.15);
+  &.is-logged-in {
+    .panel-block {
+      margin-bottom: 20px;
+    }
+
+    .block-title {
+      margin-bottom: 15px;
+    }
+  }
+}
+
+.top-menu {
+  flex-grow: 1;
+  width: $menu-width;
+}
+
+.logged-in-block {
+  margin-bottom: 20px;
+  background-color: rgba(255, 255, 255, 0.15);
+
+  > div:first-child {
+    height: 80px;
     display: flex;
     align-items: center;
-    justify-content: center;
-    margin-bottom: 35px;
+    justify-content: left;
 
-    .logged-in-info {
-      flex-grow: 1;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
+    .logged-in-more {
+      $main-radius: 25px;
 
-      .logged-in-display-name {
-        font-size: 16px;
-        font-weight: $font-semibold;
-        color: var(--menuForegroundColor);
-        cursor: pointer;
+      margin-left: 13px;
+      border-radius: $main-radius;
+      transition: all .1s ease-in-out;
+      cursor: pointer;
 
-        @include disable-default-a-behaviour;
+      *, & {
+        line-height: 1;
       }
 
-      .logged-in-username {
-        font-size: 13px;
-        color: #C6C6C6;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        max-width: 140px;
+      &.show {
+        background-color: rgba(255, 255, 255, 0.20);
+        box-shadow: inset 0 3px 5px rgba(0, 0, 0, .325);
       }
-    }
 
-    .logged-in-more {
-      margin-right: 20px;
+      @mixin display-hints($is-mobile: false) {
+        background-color: rgba(255, 255, 255, 0.15);
 
-      .glyphicon {
-        cursor: pointer;
-        font-size: 18px;
+        @if $is-mobile {
+          .dropdown-toggle-indicator {
+            display: inherit !important;
+          }
+          .dropdown-toggle:first-child {
+            padding-right: 30px !important;
+          }
+        }
+      }
+
+      &:hover {
+        @include display-hints;
+      }
+
+      /* smartphones and touchscreens */
+      @media (hover: none) and (pointer: coarse) {
+        @include display-hints($is-mobile: true);
+
+        /* fill space when on mobile */
+        max-width: calc(100% - 80px);
+        .dropdown-toggle {
+          max-width: 100%;
+        }
+        .logged-in-info {
+          max-width: calc(100% - 45px) !important;
+        }
+
+      }
 
+      .dropdown-toggle-indicator {
+        position: relative;
+        width: 0;
+        display: none;
+
+        span {
+          position: absolute;
+          right: -35px;
+          top: -8px;
+          color: grey;
+          width: $main-radius;
+        }
+      }
+
+      .dropdown-toggle {
         &::after {
           border: none;
         }
       }
+
+      .dropdown-toggle:first-child {
+        display: inline-flex;
+        align-items: center;
+        padding: 5px 7px;
+      }
+
+      img {
+        @include avatar(34px);
+
+        margin-right: 10px;
+      }
+
+      .logged-in-info {
+        max-width: 105px;
+
+        flex-grow: 1;
+
+        .logged-in-display-name,
+        .logged-in-username {
+          @include ellipsis;
+        }
+
+        .logged-in-display-name {
+          font-size: 16px;
+          font-weight: $font-semibold;
+          color: pvar(--menuForegroundColor);
+
+          @include disable-default-a-behaviour;
+        }
+
+        .logged-in-username {
+          font-size: 13px;
+          color: #C6C6C6;
+        }
+      }
+    }
+
+    my-notification {
+      margin-left: auto;
+      margin-right: 15px;
     }
   }
 
-  .button-block {
-    margin: 30px 25px 35px 25px;
+  .logged-in-menu {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    border-top: 1px solid var(--greyForegroundColor);
+
+    a {
+      @include menu-link;
+      @include disable-default-a-behaviour;
 
-    .login-button {
-      @include peertube-button-link;
-      @include orange-button;
+      $icon-size: 13px;
+      $additional-margin: ($menu-link-icon-size - $icon-size) / 2;
 
-      display: block;
+      font-size: 14px;
       width: 100%;
-      margin-bottom: 10px;
-    }
+      min-height: 35px;
 
-    .create-account-button {
-      @include peertube-button-link;
+      my-global-icon {
+        width: $icon-size;
+        height: $icon-size;
 
-      display: block;
-      width: 100%;
+        // Keep aligned with other icons
+        margin-left: $additional-margin;
 
-      color: #fff;
-      background-color: rgba(255, 255, 255, 0.25);
+        &[iconName="channel"] {
+          margin-top: -2px;
+        }
+      }
 
-      &:hover {
-        background-color: rgba(255, 255, 255, 0.28);
+      &.active,
+      &:hover,
+      &:focus-visible {
+        my-global-icon {
+          @include apply-svg-color(var(--menuForegroundColor));
+        }
+      }
+
+      &.active {
+        $border-left-width: 4px;
+
+        font-weight: $font-semibold;
+        border-left: $border-left-width solid var(--mainColor);
+
+        my-global-icon {
+          margin-left: $additional-margin - $border-left-width;
+        }
       }
     }
   }
+}
+
+.login-buttons-block {
+  margin: 30px 25px 35px 25px;
+
+  .login-button {
+    @include peertube-button-link;
+    @include orange-button;
+
+    display: block;
+    width: 100%;
+    margin-bottom: 10px;
+  }
+
+  .create-account-button {
+    @include peertube-button-link;
+
+    display: block;
+    width: 100%;
+
+    color: #fff;
+    background-color: rgba(255, 255, 255, 0.25);
+
+    &:hover {
+      background-color: rgba(255, 255, 255, 0.28);
+    }
+  }
+}
+
+.in-my-library,
+.on-instance,
+.footer-block {
+  margin-bottom: 15px;
 
   .block-title {
     text-transform: uppercase;
@@ -111,147 +291,164 @@ menu {
     font-size: 13px;
     margin-bottom: 25px;
     margin-left: 26px;
-  }
-
-  .panel-block {
-    margin-bottom: 45px;
-
-    a {
-      display: flex;
-      align-items: center;
-      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;
-
-      &.active {
-        background-color: rgba(255, 255, 255, 0.15);
-      }
 
-      &:hover, &.focus-visible {
-        background-color: rgba(255, 255, 255, 0.10);
-      }
+    @include ellipsis;
 
-      .icon {
-        @include icon(22px);
+    margin-right: 30px;
+  }
 
-        margin-right: 18px;
+  a {
+    @include menu-link;
+    @include disable-default-a-behaviour;
 
-        &.icon-videos-subscriptions {
-          position: relative;
-          top: -1px;
-          background-image: url('../../assets/images/menu/subscriptions.svg');
-        }
+    min-height: 40px;
 
-        &.icon-videos-overview {
-          position: relative;
-          background-image: url('../../assets/images/menu/globe.svg');
-        }
+    my-global-icon {
+      &[iconName="playlists"] {
+        height: 24px;
+        width: 24px;
 
-        &.icon-videos-trending {
-          position: relative;
-          top: -1px;
-          background-image: url('../../assets/images/menu/trending.svg');
-        }
+        margin-right: 16px;
+      }
 
-        &.icon-videos-recently-added {
-          width: 23px;
-          height: 23px;
-          background-image: url('../../assets/images/menu/recently-added.svg');
-        }
+      &[iconName="videos"] {
+        position: relative;
+        right: -1px;
+      }
+    }
+  }
+}
 
-        &.icon-videos-local {
-          width: 23px;
-          height: 23px;
+.footer {
+  width: $menu-width;
+  padding-bottom: 15px;
 
-          position: relative;
-          top: -1px;
+  .bottom-links {
+    display: flex;
+    flex-direction: column;
+    padding: 0 $menu-lateral-padding;
+  }
 
-          background-image: url('../../assets/images/menu/home.svg');
-        }
+  $footer-links-base-opacity: .8;
 
-        &.icon-administration {
-          width: 23px;
-          height: 23px;
+  .footer-links {
+    &, > div {
+      display: flex;
+      flex-wrap: wrap;
+    }
 
-          background-image: url('../../assets/images/menu/administration.svg');
-        }
+    a, span[role=button] {
+      display: inline-block;
+      text-decoration: none;
+      color: pvar(--menuForegroundColor);
+      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;
 
-        &.icon-about  {
-          width: 23px;
-          height: 23px;
+        my-global-icon {
+          @include apply-svg-color(pvar(--menuForegroundColor));
 
-          background-image: url('../../assets/images/menu/about.svg');
+          display: flex;
+          width: auto;
+          height: 90%;
+          margin-right: .2rem;
         }
       }
     }
   }
 
-  .footer {
-    padding-bottom: 15px;
-    padding-left: $menu-lateral-padding;
-    padding-right: $menu-lateral-padding;
-    width: $menu-width;
+  .footer-copyleft small a {
+    @include disable-default-a-behaviour;
 
-    .language, .shortcuts, .color-palette {
-      display: inline-block;
-      color: $menu-bottom-color;
-      cursor: pointer;
-      font-size: 12px;
-      font-weight: $font-semibold;
+    color: pvar(--menuForegroundColor);
+    opacity: $footer-links-base-opacity - .2;
+  }
+}
 
-      .icon {
-        @include disable-outline;
-        @include icon(28px);
-        opacity: 0.9;
+.dropdown {
+  z-index: #{z('menu') + 1} !important;
+}
 
-        &.icon-language  {
-          position: relative;
-          top: -1px;
-          width: 28px;
-          height: 24px;
+.dropdown-menu {
+  width: calc(100% + 40px);
+}
 
-          background-image: url('../../assets/images/menu/language.png');
-        }
+.dropdown-item {
+  @include dropdown-with-icon-item;
 
-        &.icon-shortcuts  {
-          position: relative;
-          top: -1px;
-          width: 24px;
-          height: 24px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
 
-          background-image: url('../../assets/images/menu/keyboard.png');
-          background-color: #fff;
-          filter: invert(100%);
-        }
+  i.glyphicon-menu-right {
+    opacity: .4;
+  }
 
-        &.icon-moonsun  {
-          margin-left: 10px;
-          position: relative;
-          top: -1px;
-          width: 24px;
-          height: 24px;
+  my-global-icon {
+    &[iconName="cog"],
+    &[iconName="sign-out"] {
+      position: relative;
+      right: -2px;
+      height: 20px;
+      width: 20px;
+    }
+  }
 
-          background-image: url('../../assets/images/menu/moonsun.svg');
-        }
+  my-global-icon.not-displayed {
+    display: none;
+  }
 
-        &:hover {
-          opacity: 1;
-        }
+  &:hover {
+    my-global-icon.hover-display-toggle.not-displayed {
+      display: inherit;
+    }
+    my-global-icon.hover-display-toggle {
+      display: none;
+    }
+
+    &.settings-sensitive {
+      my-global-icon ::ng-deep svg {
+        margin-top: 2px !important;
       }
     }
   }
 }
 
+.more-settings {
+  text-transform: uppercase;
+  font-size: 80%;
+  color: #6c757d;
+}
+
 @media screen and (max-width: $mobile-view) {
   .menu-wrapper {
     width: 100% !important;
+
+    menu {
+      overflow-y: auto;
+    }
   }
 
   .top-menu, .footer {
     width: 100% !important;
   }
+
+  .dropdown-menu {
+    width: calc(100vw - 30px);
+  }
+
+  .dropdown-item:hover, .dropdown-item:active {
+    &.settings-sensitive my-global-icon ::ng-deep svg {
+      margin-top: 0px !important;
+    }
+  }
 }