X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.scss;h=6cfe2643118ca210225778cb919e3748f885290c;hb=c5f3ff39e5351ac911418c432dac235c5aefec9e;hp=ee986a66b2497026285b1947483d9446a50acfe6;hpb=fa12eacc014aae8094d108634371640f2695bf9f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index ee986a66b..6cfe26431 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -1,5 +1,6 @@
-@use '_variables';
-@use '_mixins';
+@use 'sass:math';
+@use '_variables' as *;
+@use '_mixins' as *;
 
 $menu-link-icon-size: 22px;
 $menu-link-icon-margin-right: 18px;
@@ -15,7 +16,6 @@ $footer-links-base-opacity: .8;
 
   color: pvar(--menuForegroundColor);
   cursor: pointer;
-  font-size: 16px;
   white-space: normal;
   word-break: break-word;
   transition: background-color .1s ease-in-out;
@@ -105,6 +105,7 @@ my-notification {
 }
 
 .logged-in-more {
+
   @mixin display-hints($is-mobile: false) {
     background-color: rgba(255, 255, 255, 0.15);
 
@@ -113,18 +114,16 @@ my-notification {
         display: inherit !important;
       }
 
-      .dropdown-toggle:first-child {
-        @include padding-left(30px !important);
+      > .dropdown-toggle {
+        max-width: 88% !important;
       }
     }
   }
 
-  $main-radius: 25px;
-
   @include margin-left(13px);
 
   flex: 1;
-  border-radius: $main-radius;
+  border-radius: 25px;
   transition: all .1s ease-in-out;
   cursor: pointer;
   line-height: 1;
@@ -156,7 +155,6 @@ my-notification {
 
   .dropdown-toggle-indicator {
     position: relative;
-    width: 0;
     display: none;
 
     span {
@@ -164,21 +162,17 @@ my-notification {
       right: -35px;
       top: -8px;
       color: #808080;
-      width: $main-radius;
     }
   }
 
-  .dropdown-toggle {
-    &::after {
-      border: 0;
-    }
+  .dropdown-toggle::after {
+    border: 0;
   }
 
-  .dropdown-toggle:first-child {
+  > .dropdown-toggle:first-child {
     display: flex;
     align-items: center;
     padding: 5px 7px;
-    border-radius: $main-radius;
   }
 }
 
@@ -200,7 +194,6 @@ my-actor-avatar {
 .logged-in-display-name {
   @include disable-default-a-behaviour;
 
-  font-size: 16px;
   font-weight: $font-semibold;
   color: pvar(--menuForegroundColor);
 }
@@ -220,7 +213,7 @@ my-actor-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%;
@@ -298,18 +291,14 @@ my-actor-avatar {
 }
 
 .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;
@@ -318,23 +307,31 @@ my-actor-avatar {
   a,
   span[role=button] {
     @include margin-right(8px);
+    @include disable-default-a-behaviour;
 
-    display: inline-block;
-    text-decoration: none;
     color: pvar(--menuForegroundColor);
     opacity: $footer-links-base-opacity;
     white-space: nowrap;
-    font-size: 90%;
-    font-weight: 500;
+    font-size: 0.75rem;
     line-height: 1.4rem;
+    font-weight: $font-semibold;
+
+    &:hover {
+      opacity: $footer-links-base-opacity + .2;
+    }
   }
 }
 
-.footer-copyleft small a {
+.footer-copyleft a {
   @include disable-default-a-behaviour;
 
   color: pvar(--menuForegroundColor);
   opacity: $footer-links-base-opacity - .2;
+  font-size: 0.85rem;
+
+  &:hover {
+    opacity: $footer-links-base-opacity;
+  }
 }
 
 .dropdown {
@@ -343,6 +340,11 @@ my-actor-avatar {
 
 .dropdown-menu {
   width: calc(100% + 40px);
+
+  // Prevent weird display issue on firefox when global style is not loaded yet
+  &:not(.show) {
+    display: none;
+  }
 }
 
 .dropdown-item {
@@ -352,10 +354,6 @@ my-actor-avatar {
   display: flex;
   align-items: center;
 
-  i.glyphicon-menu-right {
-    opacity: .4;
-  }
-
   &:hover {
     .hover-display-toggle {
       display: none;
@@ -390,36 +388,20 @@ my-actor-avatar {
   .dropdown-menu {
     width: calc(100vw - 30px);
   }
-
-  .dropdown-item:hover,
-  .dropdown-item:active {
-    &.settings-sensitive my-global-icon ::ng-deep svg {
-      margin-top: 0 !important;
-    }
-  }
 }
 
 my-global-icon {
-  &[iconName=playlists] {
+  position: relative;
+  top: -1px;
+
+  .playlist-icon {
     @include margin-right(16px);
 
     height: 24px;
     width: 24px;
   }
 
-  &[iconName=videos] {
-    position: relative;
-    right: -1px;
-  }
-
-  &[iconName=channel] {
-    margin-top: -2px;
-  }
-
-  &[iconName='sign-out'] {
-    position: relative;
-    right: -2px;
-    height: 20px;
-    width: 20px;
+  &.channel-icon {
+   top: -2px;
   }
 }