Merge branch 'release/4.0.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / menu / menu.component.scss

diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 00d1a1f69c2c9d9c3c60d649bf432b301f5c15ce..f0919ed289d1930ec8eeb743948e74254a4e17e6 100644 (file)
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -1,5 +1,6 @@
-@import '_variables';
-@import '_mixins';
+@use 'sass:math';
+@use '_variables' as *;
+@use '_mixins' as *;
 
 $menu-link-icon-size: 22px;
 $menu-link-icon-margin-right: 18px;
@@ -7,16 +8,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;
 
@@ -24,17 +26,18 @@ $footer-links-base-opacity: .8;
     background-color: rgba(255, 255, 255, 0.15);
   }
 
-  &:hover, &.focus-visible {
-    background-color: rgba(255, 255, 255, 0.10);
+  &: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;
-    margin-right: $menu-link-icon-margin-right;
   }
 }
 
@@ -60,7 +63,8 @@ menu {
   margin: 0;
   padding: 0;
 
-  &:focus, &:hover {
+  &:focus,
+  &:hover {
     overflow-y: auto;
   }
 
@@ -97,8 +101,8 @@ menu {
 }
 
 my-notification {
-  margin-left: auto;
-  margin-right: 15px;
+  @include margin-left(auto);
+  @include margin-right(15px);
 }
 
 .logged-in-more {
@@ -109,23 +113,25 @@ my-notification {
       .dropdown-toggle-indicator {
         display: inherit !important;
       }
-      .dropdown-toggle:first-child {
-        padding-right: 30px !important;
+
+      .dropdown-toggle {
+        max-width: 88% !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;
   line-height: 1;
 
   &.show {
-    background-color: rgba(255, 255, 255, 0.20);
+    background-color: rgba(255, 255, 255, 0.2);
     box-shadow: inset 0 3px 5px rgba(0, 0, 0, .325);
   }
 
@@ -158,14 +164,14 @@ my-notification {
       position: absolute;
       right: -35px;
       top: -8px;
-      color: grey;
+      color: #808080;
       width: $main-radius;
     }
   }
 
   .dropdown-toggle {
     &::after {
-      border: none;
+      border: 0;
     }
   }
 
@@ -177,8 +183,8 @@ my-notification {
   }
 }
 
-my-account-avatar {
-  margin-right: 10px;
+my-actor-avatar {
+  @include margin-right(10px);
 }
 
 .logged-in-info {
@@ -193,11 +199,11 @@ my-account-avatar {
 }
 
 .logged-in-display-name {
+  @include disable-default-a-behaviour;
+
   font-size: 16px;
   font-weight: $font-semibold;
   color: pvar(--menuForegroundColor);
-
-  @include disable-default-a-behaviour;
 }
 
 .logged-in-username {
@@ -215,18 +221,18 @@ my-account-avatar {
 
   a {
     $icon-size: 13px;
-    $additional-margin: ($menu-link-icon-size - $icon-size) / 2;
+    $additional-margin: math.div($menu-link-icon-size - $icon-size, 2);
 
     font-size: 14px;
     width: 100%;
     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,
@@ -244,20 +250,20 @@ my-account-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);
       }
     }
   }
 }
 
 .login-buttons-block {
-  margin: 30px 25px 35px 25px;
+  margin: 30px 25px 35px;
 
   > a {
     display: block;
     width: 100%;
 
-    :not(:last-child) {
+    &:not(:last-child) {
       margin-bottom: 10px;
     }
   }
@@ -272,20 +278,19 @@ my-account-avatar {
   }
 }
 
-.in-my-library,
-.on-instance,
+.menu-block,
 .footer-block {
   margin-bottom: 15px;
 
   .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 {
@@ -305,13 +310,16 @@ my-account-avatar {
 }
 
 .footer-links {
-  &, > div {
+  &,
+  > div {
     display: flex;
     flex-wrap: wrap;
   }
 
   a,
   span[role=button] {
+    @include margin-right(8px);
+
     display: inline-block;
     text-decoration: none;
     color: pvar(--menuForegroundColor);
@@ -320,7 +328,6 @@ my-account-avatar {
     font-size: 90%;
     font-weight: 500;
     line-height: 1.4rem;
-    margin-right: 8px;
   }
 }
 
@@ -388,29 +395,29 @@ my-account-avatar {
   .dropdown-item:hover,
   .dropdown-item:active {
     &.settings-sensitive my-global-icon ::ng-deep svg {
-      margin-top: 0px !important;
+      margin-top: 0 !important;
     }
   }
 }
 
 my-global-icon {
-  &[iconName="playlists"] {
+  &[iconName=playlists] {
+    @include margin-right(16px);
+
     height: 24px;
     width: 24px;
-
-    margin-right: 16px;
   }
 
-  &[iconName="videos"] {
+  &[iconName=videos] {
     position: relative;
     right: -1px;
   }
 
-  &[iconName="channel"] {
+  &[iconName=channel] {
     margin-top: -2px;
   }
 
-  &[iconName="sign-out"] {
+  &[iconName='sign-out'] {
     position: relative;
     right: -2px;
     height: 20px;