4 files changed, 222 insertions, 253 deletions

diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index 9aa397edd..df5c7971d 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -5,7 +5,7 @@
         <div>
           <div class="logged-in-more" ngbDropdown #dropdown="ngbDropdown" placement="bottom-left" [container]="dropdownContainer" (openChange)="onDropdownOpenChange($event)" autoClose="outside">
             <div ngbDropdownToggle>
-              <img [src]="user.accountAvatarUrl" alt="Avatar" />
+              <my-account-avatar [account]="user.account" size="34"></my-account-avatar>
               <div class="logged-in-info">
                 <div class="logged-in-display-name">{{ user.account?.displayName }}</div>
 
@@ -40,9 +40,10 @@
 
               <a ngbDropdownItem ngbDropdownToggle class="dropdown-item settings-sensitive" routerLink="/my-account/settings"
                 fragment="video-sensitive-content-policy" #settingsSensitiveContentPolicy
-                (click)="onActiveLinkScrollToAnchor(settingsSensitiveContentPolicy)">
-                <my-global-icon class="hover-display-toggle" [ngClass]="{ 'not-displayed': user.nsfwPolicy === 'display' }" iconName="sensitive" aria-hidden="true"></my-global-icon>
-                <my-global-icon class="hover-display-toggle" [ngClass]="{ 'not-displayed': user.nsfwPolicy !== 'display' }" iconName="unsensitive" aria-hidden="true"></my-global-icon>
+                (click)="onActiveLinkScrollToAnchor(settingsSensitiveContentPolicy)"
+              >
+                <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy === 'display'" iconName="sensitive" aria-hidden="true"></my-global-icon>
+                <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy !== 'display'" iconName="unsensitive" aria-hidden="true"></my-global-icon>
                 <span i18n>Sensitive:</span>
                 <span class="ml-auto text-muted">{{ nsfwPolicy }}</span>
               </a>
@@ -72,17 +73,17 @@
         </div>
 
         <div class="logged-in-menu">
-          <a routerLink="/my-account" routerLinkActive="active" #settingsLink (click)="onActiveLinkScrollToAnchor(settingsLink)">
+          <a class="menu-link" routerLink="/my-account" routerLinkActive="active" #settingsLink (click)="onActiveLinkScrollToAnchor(settingsLink)">
             <my-global-icon iconName="user" aria-hidden="true"></my-global-icon>
             <ng-container i18n>My account</ng-container>
           </a>
 
-          <a routerLink="/my-library" routerLinkActive="active" #libraryLink (click)="onActiveLinkScrollToAnchor(libraryLink)">
+          <a class="menu-link" routerLink="/my-library" routerLinkActive="active" #libraryLink (click)="onActiveLinkScrollToAnchor(libraryLink)">
             <my-global-icon iconName="channel" aria-hidden="true"></my-global-icon>
             <ng-container i18n>My library</ng-container>
           </a>
 
-          <a *ngIf="userHasAdminAccess" [routerLink]="getFirstAdminRouteAvailable()" routerLinkActive="active">
+          <a class="menu-link" *ngIf="userHasAdminAccess" [routerLink]="getFirstAdminRouteAvailable()" routerLinkActive="active">
             <my-global-icon iconName="cog" aria-hidden="true"></my-global-icon>
             <ng-container i18n>Administration</ng-container>
           </a>
@@ -90,29 +91,29 @@
       </div>
 
       <div *ngIf="!isLoggedIn" class="login-buttons-block">
-        <a i18n routerLink="/login" class="login-button">Login</a>
-        <a i18n *ngIf="isRegistrationAllowed()" routerLink="/signup" class="create-account-button">Create an account</a>
+        <a i18n routerLink="/login" class="peertube-button-link orange-button">Login</a>
+        <a i18n *ngIf="isRegistrationAllowed()" routerLink="/signup" class="peertube-button-link">Create an account</a>
       </div>
 
       <div *ngIf="isLoggedIn" class="in-my-library">
         <div i18n class="block-title">IN MY LIBRARY</div>
 
-        <a *ngIf="user.canSeeVideosLink" routerLink="/my-library/videos" routerLinkActive="active">
+        <a *ngIf="user.canSeeVideosLink" class="menu-link" routerLink="/my-library/videos" routerLinkActive="active">
           <my-global-icon iconName="videos" aria-hidden="true"></my-global-icon>
           <ng-container i18n>Videos</ng-container>
         </a>
 
-        <a routerLink="/my-library/video-playlists" routerLinkActive="active">
+        <a class="menu-link" routerLink="/my-library/video-playlists" routerLinkActive="active">
           <my-global-icon iconName="playlists" aria-hidden="true"></my-global-icon>
           <ng-container i18n>Playlists</ng-container>
         </a>
 
-        <a routerLink="/videos/subscriptions" routerLinkActive="active">
+        <a class="menu-link" routerLink="/videos/subscriptions" routerLinkActive="active">
           <my-global-icon iconName="subscriptions" aria-hidden="true"></my-global-icon>
           <ng-container i18n>Subscriptions</ng-container>
         </a>
 
-        <a routerLink="/my-library/history/videos" routerLinkActive="active">
+        <a class="menu-link" routerLink="/my-library/history/videos" routerLinkActive="active">
           <my-global-icon iconName="history" aria-hidden="true"></my-global-icon>
           <ng-container i18n>History</ng-container>
         </a>
@@ -122,22 +123,22 @@
       <div class="on-instance">
         <div i18n class="block-title">ON {{instanceName}}</div>
 
-        <a routerLink="/videos/overview" routerLinkActive="active">
+        <a class="menu-link" routerLink="/videos/overview" routerLinkActive="active">
           <my-global-icon iconName="globe" aria-hidden="true"></my-global-icon>
           <ng-container i18n>Discover</ng-container>
         </a>
 
-        <a routerLink="/videos/trending" routerLinkActive="active">
+        <a class="menu-link" routerLink="/videos/trending" routerLinkActive="active">
           <my-global-icon iconName="trending" aria-hidden="true"></my-global-icon>
           <ng-container i18n>Trending</ng-container>
         </a>
 
-        <a routerLink="/videos/recently-added" routerLinkActive="active">
+        <a class="menu-link" routerLink="/videos/recently-added" routerLinkActive="active">
           <my-global-icon iconName="recently-added" aria-hidden="true"></my-global-icon>
           <ng-container i18n>Recently added</ng-container>
         </a>
 
-        <a routerLink="/videos/local" routerLinkActive="active">
+        <a class="menu-link" routerLink="/videos/local" routerLinkActive="active">
           <my-global-icon iconName="home" aria-hidden="true"></my-global-icon>
           <ng-container i18n>Local videos</ng-container>
         </a>
@@ -146,18 +147,18 @@
 
     <div class="footer">
       <div class="footer-block">
-        <a *ngIf="!isLoggedIn" (click)="openQuickSettings()">
+        <a *ngIf="!isLoggedIn" class="menu-link" (click)="openQuickSettings()">
           <my-global-icon iconName="cog" aria-hidden="true"></my-global-icon>
           <ng-container i18n>My settings</ng-container>
         </a>
 
-        <a routerLink="/about" routerLinkActive="active">
+        <a class="menu-link" routerLink="/about" routerLinkActive="active">
           <my-global-icon iconName="help" aria-hidden="true"></my-global-icon>
           <ng-container i18n>About</ng-container>
         </a>
       </div>
 
-      <div class="bottom-links">
+      <div class="footer-bottom">
 
         <div class="footer-links">
           <div *ngIf="isLoggedIn === false">
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 2ea66e57d..00d1a1f69 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -3,8 +3,11 @@
 
 $menu-link-icon-size: 22px;
 $menu-link-icon-margin-right: 18px;
+$footer-links-base-opacity: .8;
+
+.menu-link {
+  @include disable-default-a-behaviour;
 
-@mixin menu-link {
   display: flex;
   align-items: center;
   padding-left: $menu-lateral-padding;
@@ -90,169 +93,158 @@ menu {
     display: flex;
     align-items: center;
     justify-content: left;
+  }
+}
 
-    .logged-in-more {
-      $main-radius: 25px;
+my-notification {
+  margin-left: auto;
+  margin-right: 15px;
+}
 
-      flex: 1;
-      margin-left: 13px;
-      border-radius: $main-radius;
-      transition: all .1s ease-in-out;
-      cursor: pointer;
+.logged-in-more {
+  @mixin display-hints($is-mobile: false) {
+    background-color: rgba(255, 255, 255, 0.15);
 
-      *, & {
-        line-height: 1;
+    @if $is-mobile {
+      .dropdown-toggle-indicator {
+        display: inherit !important;
       }
-
-      &.show {
-        background-color: rgba(255, 255, 255, 0.20);
-        box-shadow: inset 0 3px 5px rgba(0, 0, 0, .325);
+      .dropdown-toggle:first-child {
+        padding-right: 30px !important;
       }
+    }
+  }
 
-      @mixin display-hints($is-mobile: false) {
-        background-color: rgba(255, 255, 255, 0.15);
-
-        @if $is-mobile {
-          .dropdown-toggle-indicator {
-            display: inherit !important;
-          }
-          .dropdown-toggle:first-child {
-            padding-right: 30px !important;
-          }
-        }
-      }
+  $main-radius: 25px;
 
-      &:hover {
-        @include display-hints;
-      }
+  flex: 1;
+  margin-left: 13px;
+  border-radius: $main-radius;
+  transition: all .1s ease-in-out;
+  cursor: pointer;
+  line-height: 1;
 
-      /* smartphones and touchscreens */
-      @media (hover: none) and (pointer: coarse) {
-        @include display-hints($is-mobile: true);
+  &.show {
+    background-color: rgba(255, 255, 255, 0.20);
+    box-shadow: inset 0 3px 5px rgba(0, 0, 0, .325);
+  }
 
-        /* fill space when on mobile */
-        max-width: calc(100% - 80px);
-        .dropdown-toggle {
-          max-width: 100%;
-        }
-        .logged-in-info {
-          max-width: calc(100% - 45px) !important;
-        }
+  &:hover {
+    @include display-hints;
+  }
 
-      }
+  /* smartphones and touchscreens */
+  @media (hover: none) and (pointer: coarse) {
+    @include display-hints($is-mobile: true);
 
-      .dropdown-toggle-indicator {
-        position: relative;
-        width: 0;
-        display: none;
-
-        span {
-          position: absolute;
-          right: -35px;
-          top: -8px;
-          color: grey;
-          width: $main-radius;
-        }
-      }
+    /* fill space when on mobile */
+    max-width: calc(100% - 80px);
 
-      .dropdown-toggle {
-        &::after {
-          border: none;
-        }
-      }
+    .dropdown-toggle {
+      max-width: 100%;
+    }
 
-      .dropdown-toggle:first-child {
-        display: flex;
-        align-items: center;
-        padding: 5px 7px;
-        border-radius: $main-radius;
-      }
+    .logged-in-info {
+      max-width: calc(100% - 45px) !important;
+    }
+  }
 
-      img {
-        @include avatar(34px);
+  .dropdown-toggle-indicator {
+    position: relative;
+    width: 0;
+    display: none;
 
-        margin-right: 10px;
-      }
+    span {
+      position: absolute;
+      right: -35px;
+      top: -8px;
+      color: grey;
+      width: $main-radius;
+    }
+  }
 
-      .logged-in-info {
-        max-width: 105px;
+  .dropdown-toggle {
+    &::after {
+      border: none;
+    }
+  }
 
-        flex-grow: 1;
+  .dropdown-toggle:first-child {
+    display: flex;
+    align-items: center;
+    padding: 5px 7px;
+    border-radius: $main-radius;
+  }
+}
 
-        .logged-in-display-name,
-        .logged-in-username {
-          @include ellipsis;
-        }
+my-account-avatar {
+  margin-right: 10px;
+}
 
-        .logged-in-display-name {
-          font-size: 16px;
-          font-weight: $font-semibold;
-          color: pvar(--menuForegroundColor);
+.logged-in-info {
+  max-width: 105px;
 
-          @include disable-default-a-behaviour;
-        }
+  flex-grow: 1;
+}
 
-        .logged-in-username {
-          font-size: 13px;
-          color: #C6C6C6;
-          margin-top: 3px;
-        }
-      }
-    }
+.logged-in-display-name,
+.logged-in-username {
+  @include ellipsis;
+}
 
-    my-notification {
-      margin-left: auto;
-      margin-right: 15px;
-    }
-  }
+.logged-in-display-name {
+  font-size: 16px;
+  font-weight: $font-semibold;
+  color: pvar(--menuForegroundColor);
 
-  .logged-in-menu {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    border-top: 1px solid var(--greyForegroundColor);
-    line-height: $line-height-normal;
+  @include disable-default-a-behaviour;
+}
 
-    a {
-      @include menu-link;
-      @include disable-default-a-behaviour;
+.logged-in-username {
+  font-size: 13px;
+  color: #C6C6C6;
+  margin-top: 3px;
+}
 
-      $icon-size: 13px;
-      $additional-margin: ($menu-link-icon-size - $icon-size) / 2;
+.logged-in-menu {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  border-top: 1px solid var(--greyForegroundColor);
+  line-height: $line-height-normal;
 
-      font-size: 14px;
-      width: 100%;
-      min-height: 35px;
+  a {
+    $icon-size: 13px;
+    $additional-margin: ($menu-link-icon-size - $icon-size) / 2;
 
-      my-global-icon {
-        width: $icon-size;
-        height: $icon-size;
+    font-size: 14px;
+    width: 100%;
+    min-height: 35px;
 
-        // Keep aligned with other icons
-        margin-left: $additional-margin;
+    my-global-icon {
+      width: $icon-size;
+      height: $icon-size;
 
-        &[iconName="channel"] {
-          margin-top: -2px;
-        }
-      }
+      // Keep aligned with other icons
+      margin-left: $additional-margin;
+    }
 
-      &.active,
-      &:hover,
-      &:focus-visible {
-        my-global-icon {
-          @include apply-svg-color(var(--menuForegroundColor));
-        }
+    &.active,
+    &:hover,
+    &:focus-visible {
+      my-global-icon {
+        @include apply-svg-color(var(--menuForegroundColor));
       }
+    }
 
-      &.active {
-        $border-left-width: 4px;
+    &.active {
+      $border-left-width: 4px;
 
-        font-weight: $font-semibold;
-        border-left: $border-left-width solid var(--mainColor);
+      font-weight: $font-semibold;
+      border-left: $border-left-width solid var(--mainColor);
 
-        my-global-icon {
-          margin-left: $additional-margin - $border-left-width;
-        }
+      my-global-icon {
+        margin-left: $additional-margin - $border-left-width;
       }
     }
   }
@@ -261,27 +253,22 @@ menu {
 .login-buttons-block {
   margin: 30px 25px 35px 25px;
 
-  .login-button {
-    @include peertube-button-link;
-    @include orange-button;
-
+  > a {
     display: block;
     width: 100%;
-    margin-bottom: 10px;
-  }
 
-  .create-account-button {
-    @include peertube-button-link;
-
-    display: block;
-    width: 100%;
+    :not(:last-child) {
+      margin-bottom: 10px;
+    }
+  }
+}
 
-    color: #fff;
-    background-color: rgba(255, 255, 255, 0.25);
+.create-account-button {
+  color: #fff;
+  background-color: rgba(255, 255, 255, 0.25);
 
-    &:hover {
-      background-color: rgba(255, 255, 255, 0.28);
-    }
+  &:hover {
+    background-color: rgba(255, 255, 255, 0.28);
   }
 }
 
@@ -291,92 +278,57 @@ menu {
   margin-bottom: 15px;
 
   .block-title {
+    @include ellipsis;
+
     text-transform: uppercase;
     font-weight: $font-bold; // Bold
     font-size: 13px;
     margin-bottom: 25px;
     margin-left: 26px;
-
-    @include ellipsis;
-
     margin-right: 30px;
   }
 
   a {
-    @include menu-link;
-    @include disable-default-a-behaviour;
-
     min-height: 40px;
-
-    my-global-icon {
-      &[iconName="playlists"] {
-        height: 24px;
-        width: 24px;
-
-        margin-right: 16px;
-      }
-
-      &[iconName="videos"] {
-        position: relative;
-        right: -1px;
-      }
-    }
   }
 }
 
 .footer {
   width: $menu-width;
   padding-bottom: 15px;
+}
+
+.footer-bottom {
+  display: flex;
+  flex-direction: column;
+  padding: 0 $menu-lateral-padding;
+}
 
-  .bottom-links {
+.footer-links {
+  &, > div {
     display: flex;
-    flex-direction: column;
-    padding: 0 $menu-lateral-padding;
+    flex-wrap: wrap;
   }
 
-  $footer-links-base-opacity: .8;
-
-  .footer-links {
-    &, > div {
-      display: flex;
-      flex-wrap: wrap;
-    }
-
-    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;
-
-        my-global-icon {
-          @include apply-svg-color(pvar(--menuForegroundColor));
-
-          display: flex;
-          width: auto;
-          height: 90%;
-          margin-right: .2rem;
-        }
-      }
-    }
+  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;
   }
+}
 
-  .footer-copyleft small a {
-    @include disable-default-a-behaviour;
+.footer-copyleft small a {
+  @include disable-default-a-behaviour;
 
-    color: pvar(--menuForegroundColor);
-    opacity: $footer-links-base-opacity - .2;
-  }
+  color: pvar(--menuForegroundColor);
+  opacity: $footer-links-base-opacity - .2;
 }
 
 .dropdown {
@@ -398,32 +350,13 @@ 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;
     }
 
-    &.settings-sensitive {
-      my-global-icon ::ng-deep svg {
-        margin-top: 2px !important;
-      }
+    .hover-display-toggle[hidden] {
+      display: inherit !important;
     }
   }
 }
@@ -443,7 +376,8 @@ menu {
     }
   }
 
-  .top-menu, .footer {
+  .top-menu,
+  .footer {
     width: 100% !important;
   }
 
@@ -451,9 +385,35 @@ menu {
     width: calc(100vw - 30px);
   }
 
-  .dropdown-item:hover, .dropdown-item:active {
+  .dropdown-item:hover,
+  .dropdown-item:active {
     &.settings-sensitive my-global-icon ::ng-deep svg {
       margin-top: 0px !important;
     }
   }
 }
+
+my-global-icon {
+  &[iconName="playlists"] {
+    height: 24px;
+    width: 24px;
+
+    margin-right: 16px;
+  }
+
+  &[iconName="videos"] {
+    position: relative;
+    right: -1px;
+  }
+
+  &[iconName="channel"] {
+    margin-top: -2px;
+  }
+
+  &[iconName="sign-out"] {
+    position: relative;
+    right: -2px;
+    height: 20px;
+    width: 20px;
+  }
+}
diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts
index ed20d9c01..9b6b7cda5 100644
--- a/client/src/app/menu/menu.component.ts
+++ b/client/src/app/menu/menu.component.ts
@@ -10,6 +10,7 @@ import { LanguageChooserComponent } from '@app/menu/language-chooser.component'
 import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
 import { ServerConfig, UserRight, VideoConstant } from '@shared/models'
 import { NgbDropdown, NgbDropdownConfig } from '@ng-bootstrap/ng-bootstrap'
+import { PeertubeModalService } from '@app/shared/shared-main/peertube-modal/peertube-modal.service'
 
 const logger = debug('peertube:menu:MenuComponent')
 
@@ -54,6 +55,7 @@ export class MenuComponent implements OnInit {
     private hotkeysService: HotkeysService,
     private screenService: ScreenService,
     private menuService: MenuService,
+    private modalService: PeertubeModalService,
     private dropdownConfig: NgbDropdownConfig,
     private router: Router
   ) {
@@ -130,6 +132,9 @@ export class MenuComponent implements OnInit {
         this.authService.userInformationLoaded
           .subscribe(() => this.buildUserLanguages())
       })
+
+    this.modalService.openQuickSettingsSubject
+      .subscribe(() => this.openQuickSettings())
   }
 
   isRegistrationAllowed () {
diff --git a/client/src/app/menu/notification.component.scss b/client/src/app/menu/notification.component.scss
index 40feb9e66..c65787779 100644
--- a/client/src/app/menu/notification.component.scss
+++ b/client/src/app/menu/notification.component.scss
@@ -1,6 +1,9 @@
 @import '_variables';
 @import '_mixins';
 
+.content {
+  scrollbar-color: auto;
+}
 
 .notification-inbox-popover {
   padding: 10px;