4 files changed, 31 insertions, 21 deletions

diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index 16c79efc1..46dd807ec 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -3,7 +3,10 @@
     <div class="top-menu">
       <div *ngIf="isLoggedIn" class="logged-in-block">
         <div>
-          <div class="logged-in-more" ngbDropdown #dropdown="ngbDropdown" placement="bottom-left" [container]="dropdownContainer" (openChange)="onDropdownOpenChange($event)" autoClose="outside">
+          <div
+            class="logged-in-more" ngbDropdown #dropdown="ngbDropdown" placement="bottom-left auto"
+            [container]="dropdownContainer" (openChange)="onDropdownOpenChange($event)" autoClose="outside"
+          >
             <div ngbDropdownToggle>
               <my-actor-avatar [account]="user.account" size="34"></my-actor-avatar>
               <div class="logged-in-info">
@@ -18,8 +21,10 @@
             </div>
 
             <div ngbDropdownMenu>
-              <a *ngIf="user.account" ngbDropdownItem ngbDropdownToggle class="dropdown-item" [routerLink]="[ '/a', user.account.nameWithHost ]"
-                #profile (click)="onActiveLinkScrollToAnchor(profile)">
+              <a
+                *ngIf="user.account" ngbDropdownItem ngbDropdownToggle class="dropdown-item" [routerLink]="[ '/a', user.account.nameWithHost ]"
+                #profile (click)="onActiveLinkScrollToAnchor(profile)"
+              >
                 <my-global-icon iconName="go" aria-hidden="true"></my-global-icon> <ng-container i18n>Public profile</ng-container>
               </a>
 
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index daaed2d32..8e9c02b23 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -7,16 +7,17 @@ $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;
-  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;
   line-height: $line-height-normal;
 
@@ -31,11 +32,11 @@ $footer-links-base-opacity: .8;
 
   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;
-    margin-right: $menu-link-icon-margin-right;
   }
 }
 
@@ -99,8 +100,8 @@ menu {
 }
 
 my-notification {
-  margin-left: auto;
-  margin-right: 15px;
+  @include margin-left(auto);
+  @include margin-right(15px);
 }
 
 .logged-in-more {
@@ -111,16 +112,18 @@ my-notification {
       .dropdown-toggle-indicator {
         display: inherit !important;
       }
+
       .dropdown-toggle:first-child {
-        padding-right: 30px !important;
+        @include padding-left(30px !important);
       }
     }
   }
 
   $main-radius: 25px;
 
+  @include margin-left(13px);
+
   flex: 1;
-  margin-left: 13px;
   border-radius: $main-radius;
   transition: all .1s ease-in-out;
   cursor: pointer;
@@ -180,7 +183,7 @@ my-notification {
 }
 
 my-actor-avatar {
-  margin-right: 10px;
+  @include margin-right(10px);
 }
 
 .logged-in-info {
@@ -224,11 +227,11 @@ my-actor-avatar {
     min-height: 35px;
 
     my-global-icon {
+      // Keep aligned with other icons
+      @include margin-left($additional-margin);
+
       width: $icon-size;
       height: $icon-size;
-
-      // Keep aligned with other icons
-      margin-left: $additional-margin;
     }
 
     &.active,
@@ -246,7 +249,7 @@ my-actor-avatar {
       border-left: $border-left-width solid var(--mainColor);
 
       my-global-icon {
-        margin-left: $additional-margin - $border-left-width;
+        @include margin-left($additional-margin - $border-left-width);
       }
     }
   }
@@ -280,13 +283,13 @@ my-actor-avatar {
 
   .block-title {
     @include ellipsis;
+    @include margin-left(26px);
+    @include margin-right(30px);
 
     text-transform: uppercase;
     font-weight: $font-bold; // Bold
     font-size: 13px;
     margin-bottom: 25px;
-    margin-left: 26px;
-    margin-right: 30px;
   }
 
   a {
@@ -314,6 +317,8 @@ my-actor-avatar {
 
   a,
   span[role=button] {
+    @include margin-right(8px);
+
     display: inline-block;
     text-decoration: none;
     color: pvar(--menuForegroundColor);
@@ -322,7 +327,6 @@ my-actor-avatar {
     font-size: 90%;
     font-weight: 500;
     line-height: 1.4rem;
-    margin-right: 8px;
   }
 }
 
@@ -397,10 +401,10 @@ my-actor-avatar {
 
 my-global-icon {
   &[iconName=playlists] {
+    @include margin-right(16px);
+
     height: 24px;
     width: 24px;
-
-    margin-right: 16px;
   }
 
   &[iconName=videos] {
diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts
index fa104cc43..be6e8af51 100644
--- a/client/src/app/menu/menu.component.ts
+++ b/client/src/app/menu/menu.component.ts
@@ -94,6 +94,7 @@ export class MenuComponent implements OnInit {
     this.htmlServerConfig = this.serverService.getHTMLConfig()
     this.currentInterfaceLanguage = this.languageChooserModal.getCurrentLanguage()
 
+    this.isLoggedIn = this.authService.isLoggedIn()
     this.updateUserState()
     this.buildMenuSections()
 
diff --git a/client/src/app/menu/notification.component.scss b/client/src/app/menu/notification.component.scss
index 554c20ca9..23d7181d0 100644
--- a/client/src/app/menu/notification.component.scss
+++ b/client/src/app/menu/notification.component.scss
@@ -141,7 +141,7 @@
   position: relative;
 
   .unread-notifications {
-    margin-left: 20px;
+    @include margin-left(20px);
   }
 
   .unread-notifications {