X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.scss;h=f0919ed289d1930ec8eeb743948e74254a4e17e6;hb=cce70ae5ca3a2bfd893a7a8c457086151470de70;hp=8f8c31417966f5a81da9b7917da7afffd3aa7151;hpb=e66883b37ae0796256b3aba550670a2d76cfc98a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 8f8c31417..f0919ed28 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -1,5 +1,45 @@
-@import '_variables';
-@import '_mixins';
+@use 'sass:math';
+@use '_variables' as *;
+@use '_mixins' as *;
+
+$menu-link-icon-size: 22px;
+$menu-link-icon-margin-right: 18px;
+$footer-links-base-opacity: .8;
+
+.menu-link {
+  @include disable-default-a-behaviour;
+  @include padding-left($menu-lateral-padding);
+  @include padding-right(20px);
+
+  display: flex;
+  align-items: center;
+
+  color: pvar(--menuForegroundColor);
+  cursor: pointer;
+  font-size: 16px;
+  white-space: normal;
+  word-break: break-word;
+  transition: background-color .1s ease-in-out;
+  line-height: $line-height-normal;
+
+  &.active {
+    background-color: rgba(255, 255, 255, 0.15);
+  }
+
+  &:hover,
+  &.focus-visible {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+
+  my-global-icon {
+    @include apply-svg-color(#808080);
+    @include margin-right($menu-link-icon-margin-right);
+
+    display: flex;
+    width: $menu-link-icon-size;
+    height: $menu-link-icon-size;
+  }
+}
 
 .menu-wrapper {
   position: fixed;
@@ -14,16 +54,17 @@ menu {
   @include ellipsis;
 
   background-color: pvar(--menuBackgroundColor);
-  margin: 0;
-  padding: 0;
-  height: 100%;
-  overflow-x: hidden;
   color: pvar(--menuForegroundColor);
+
   display: flex;
   flex-direction: column;
+  height: 100%;
   width: 100%;
+  margin: 0;
+  padding: 0;
 
-  &:focus, &:hover {
+  &:focus,
+  &:hover {
     overflow-y: auto;
   }
 
@@ -31,7 +72,7 @@ menu {
     overflow-y: auto;
   }
 
-  &.logged-in {
+  &.is-logged-in {
     .panel-block {
       margin-bottom: 20px;
     }
@@ -40,205 +81,265 @@ menu {
       margin-bottom: 15px;
     }
   }
+}
 
-  .top-menu {
-    flex-grow: 1;
-    width: $menu-width;
-  }
+.top-menu {
+  flex-grow: 1;
+  width: $menu-width;
+}
 
-  .logged-in-block {
-    height: 100px;
-    background-color: rgba(255, 255, 255, 0.15);
+.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: 20px;
-
-    .logged-in-info {
-      @include ellipsis;
+    justify-content: left;
+  }
+}
 
-      flex-grow: 1;
+my-notification {
+  @include margin-left(auto);
+  @include margin-right(15px);
+}
 
-      .logged-in-display-name {
-        font-size: 16px;
-        font-weight: $font-semibold;
-        color: pvar(--menuForegroundColor);
-        cursor: pointer;
+.logged-in-more {
+  @mixin display-hints($is-mobile: false) {
+    background-color: rgba(255, 255, 255, 0.15);
 
-        @include disable-default-a-behaviour;
+    @if $is-mobile {
+      .dropdown-toggle-indicator {
+        display: inherit !important;
       }
 
-      .logged-in-username {
-        @include ellipsis;
-
-        font-size: 13px;
-        color: #C6C6C6;
-        max-width: 140px;
-        cursor: pointer;
+      .dropdown-toggle {
+        max-width: 88% !important;
       }
     }
+  }
 
-    .logged-in-more {
-      margin-right: 20px;
+  $main-radius: 25px;
 
-      my-global-icon.dropdown-toggle {
-        cursor: pointer;
+  @include margin-left(13px);
 
-        &::after {
-          border: none;
-        }
+  flex: 1;
+  border-radius: $main-radius;
+  transition: all .1s ease-in-out;
+  cursor: pointer;
+  line-height: 1;
 
-        ::ng-deep {
-          @include apply-svg-color(pvar(--menuForegroundColor));
-        }
-      }
-    }
+  &.show {
+    background-color: rgba(255, 255, 255, 0.2);
+    box-shadow: inset 0 3px 5px rgba(0, 0, 0, .325);
   }
 
-  .button-block {
-    margin: 30px 25px 35px 25px;
+  &:hover {
+    @include display-hints;
+  }
 
-    .login-button {
-      @include peertube-button-link;
-      @include orange-button;
+  /* smartphones and touchscreens */
+  @media (hover: none) and (pointer: coarse) {
+    @include display-hints($is-mobile: true);
 
-      display: block;
-      width: 100%;
-      margin-bottom: 10px;
+    /* fill space when on mobile */
+    max-width: calc(100% - 80px);
+
+    .dropdown-toggle {
+      max-width: 100%;
     }
 
-    .create-account-button {
-      @include peertube-button-link;
+    .logged-in-info {
+      max-width: calc(100% - 45px) !important;
+    }
+  }
 
-      display: block;
-      width: 100%;
+  .dropdown-toggle-indicator {
+    position: relative;
+    width: 0;
+    display: none;
 
-      color: #fff;
-      background-color: rgba(255, 255, 255, 0.25);
+    span {
+      position: absolute;
+      right: -35px;
+      top: -8px;
+      color: #808080;
+      width: $main-radius;
+    }
+  }
 
-      &:hover {
-        background-color: rgba(255, 255, 255, 0.28);
-      }
+  .dropdown-toggle {
+    &::after {
+      border: 0;
     }
   }
 
-  .block-title {
-    text-transform: uppercase;
-    font-weight: $font-bold; // Bold
-    font-size: 13px;
-    margin-bottom: 25px;
-    margin-left: 26px;
+  .dropdown-toggle:first-child {
+    display: flex;
+    align-items: center;
+    padding: 5px 7px;
+    border-radius: $main-radius;
   }
+}
 
-  .panel-block {
-    margin-bottom: 15px;
-
-    a {
-      @include disable-default-a-behaviour;
-
-      display: flex;
-      align-items: center;
-      padding-left: $menu-lateral-padding;
-      color: pvar(--menuForegroundColor);
-      cursor: pointer;
-      min-height: 40px;
-      font-size: 16px;
-      transition: background-color .1s ease-in-out;
-      white-space: normal;
-      word-break: break-word;
-      padding-right: 20px;
-
-      &.active {
-        background-color: rgba(255, 255, 255, 0.15);
-      }
+my-actor-avatar {
+  @include margin-right(10px);
+}
 
-      &:hover, &.focus-visible {
-        background-color: rgba(255, 255, 255, 0.10);
-      }
+.logged-in-info {
+  max-width: 105px;
 
-      my-global-icon {
-        @include apply-svg-color(#808080);
+  flex-grow: 1;
+}
+
+.logged-in-display-name,
+.logged-in-username {
+  @include ellipsis;
+}
+
+.logged-in-display-name {
+  @include disable-default-a-behaviour;
+
+  font-size: 16px;
+  font-weight: $font-semibold;
+  color: pvar(--menuForegroundColor);
+}
+
+.logged-in-username {
+  font-size: 13px;
+  color: #C6C6C6;
+  margin-top: 3px;
+}
+
+.logged-in-menu {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  border-top: 1px solid var(--greyForegroundColor);
+  line-height: $line-height-normal;
+
+  a {
+    $icon-size: 13px;
+    $additional-margin: math.div($menu-link-icon-size - $icon-size, 2);
 
-        display: flex;
-        width: 22px;
-        height: 22px;
-        margin-right: 18px;
+    font-size: 14px;
+    width: 100%;
+    min-height: 35px;
 
-        &[iconName="playlists"] {
-          height: 24px;
-          width: 24px;
+    my-global-icon {
+      // Keep aligned with other icons
+      @include margin-left($additional-margin);
 
-          margin-right: 16px;
-        }
+      width: $icon-size;
+      height: $icon-size;
+    }
 
-        &[iconName="videos"] {
-          position: relative;
-          right: -1px;
-        }
+    &.active,
+    &:hover,
+    &:focus-visible {
+      my-global-icon {
+        @include apply-svg-color(var(--menuForegroundColor));
       }
+    }
 
-      .icon {
-        @include icon(22px);
+    &.active {
+      $border-left-width: 4px;
 
-        margin-right: 18px;
+      font-weight: $font-semibold;
+      border-left: $border-left-width solid var(--mainColor);
+
+      my-global-icon {
+        @include margin-left($additional-margin - $border-left-width);
       }
     }
   }
+}
 
-  .footer {
-    width: $menu-width;
-    padding-bottom: 15px;
+.login-buttons-block {
+  margin: 30px 25px 35px;
+
+  > a {
+    display: block;
+    width: 100%;
 
-    .bottom-links {
-      display: flex;
-      flex-direction: column;
-      padding: 0 $menu-lateral-padding;
+    &:not(:last-child) {
+      margin-bottom: 10px;
     }
+  }
+}
 
-    $footer-links-base-opacity: .8;
+.create-account-button {
+  color: #fff;
+  background-color: rgba(255, 255, 255, 0.25);
 
-    .footer-links {
-      &, > div {
-        display: flex;
-        flex-wrap: wrap;
-      }
+  &:hover {
+    background-color: rgba(255, 255, 255, 0.28);
+  }
+}
 
-      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;
-          }
-        }
-      }
-    }
+.menu-block,
+.footer-block {
+  margin-bottom: 15px;
 
-    .footer-copyleft small a {
-      @include disable-default-a-behaviour;
+  .block-title {
+    @include ellipsis;
+    @include margin-left(26px);
+    @include margin-right(30px);
 
-      color: pvar(--mainBackgroundColor);
-      opacity: $footer-links-base-opacity - .2;
-    }
+    text-transform: uppercase;
+    font-weight: $font-bold; // Bold
+    font-size: 13px;
+    margin-bottom: 25px;
+  }
+
+  a {
+    min-height: 40px;
+  }
+}
+
+.footer {
+  width: $menu-width;
+  padding-bottom: 15px;
+}
+
+.footer-bottom {
+  display: flex;
+  flex-direction: column;
+  padding: 0 $menu-lateral-padding;
+}
+
+.footer-links {
+  &,
+  > div {
+    display: flex;
+    flex-wrap: wrap;
   }
+
+  a,
+  span[role=button] {
+    @include margin-right(8px);
+
+    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;
+  }
+}
+
+.footer-copyleft small a {
+  @include disable-default-a-behaviour;
+
+  color: pvar(--menuForegroundColor);
+  opacity: $footer-links-base-opacity - .2;
+}
+
+.dropdown {
+  z-index: #{z('menu') + 1} !important;
 }
 
 .dropdown-menu {
@@ -256,27 +357,14 @@ menu {
     opacity: .4;
   }
 
-  my-global-icon {
-    &[iconName="cog"],
-    &[iconName="sign-out"] {
-      position: relative;
-      right: -2px;
-      height: 20px;
-      width: 20px;
-    }
-  }
-
-  my-global-icon.not-displayed {
-    display: none;
-  }
-
   &:hover {
-    my-global-icon.hover-display-toggle.not-displayed {
-      display: inherit;
-    }
-    my-global-icon.hover-display-toggle {
+    .hover-display-toggle {
       display: none;
     }
+
+    .hover-display-toggle[hidden] {
+      display: inherit !important;
+    }
   }
 }
 
@@ -286,72 +374,53 @@ menu {
   color: #6c757d;
 }
 
-.icon {
-  @include disable-outline;
-  @include icon(22px);
-  opacity: 0.8;
-
-  &.icon-shortcuts  {
-    position: relative;
-    top: -1px;
-    margin-right: 10px;
+@media screen and (max-width: $mobile-view) {
+  .menu-wrapper {
+    width: 100% !important;
 
-    background-image: url('../../assets/images/menu/keyboard.png');
+    menu {
+      overflow-y: auto;
+    }
   }
-}
-
-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;
+  .top-menu,
+  .footer {
+    width: 100% !important;
+  }
 
-  &:after {
-    content: '';
-    position: absolute;
-    top: 3px;
-    left: 3px;
-    width: 14px;
-    height: 14px;
-    background: pvar(--mainBackgroundColor);
-    border-radius: 50%;
-    transition: 0.3s ease-out;
+  .dropdown-menu {
+    width: calc(100vw - 30px);
   }
 
-  &:active:after {
-    width: 40px;
+  .dropdown-item:hover,
+  .dropdown-item:active {
+    &.settings-sensitive my-global-icon ::ng-deep svg {
+      margin-top: 0 !important;
+    }
   }
 }
 
-input:checked + label {
-  background: pvar(--mainColor);
+my-global-icon {
+  &[iconName=playlists] {
+    @include margin-right(16px);
 
-  &:after {
-    left: calc(100% - 3px);
-    transform: translateX(-100%);
+    height: 24px;
+    width: 24px;
   }
-}
 
-@media screen and (max-width: $mobile-view) {
-  .menu-wrapper {
-    width: 100% !important;
+  &[iconName=videos] {
+    position: relative;
+    right: -1px;
+  }
 
-    menu {
-      overflow-y: auto;
-    }
+  &[iconName=channel] {
+    margin-top: -2px;
   }
 
-  .top-menu, .footer {
-    width: 100% !important;
+  &[iconName='sign-out'] {
+    position: relative;
+    right: -2px;
+    height: 20px;
+    width: 20px;
   }
 }