X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.scss;h=352682bfc2fab65e0a5e11a80967a3052b39eab6;hb=93c728a25a87cf6dae5fc49d42d6af52ff7f7ff2;hp=8e9c02b23694823978dda28e24b8d82e19a06435;hpb=27bc95867442c772841fb183a625bbda61dede51;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 8e9c02b23..352682bfc 100644 --- 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; @@ -105,6 +106,7 @@ my-notification { } .logged-in-more { + @mixin display-hints($is-mobile: false) { background-color: rgba(255, 255, 255, 0.15); @@ -113,18 +115,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 +156,6 @@ my-notification { .dropdown-toggle-indicator { position: relative; - width: 0; display: none; span { @@ -164,21 +163,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; } } @@ -220,7 +215,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%; @@ -343,6 +338,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 +352,6 @@ my-actor-avatar { display: flex; align-items: center; - i.glyphicon-menu-right { - opacity: .4; - } - &:hover { .hover-display-toggle { display: none; @@ -390,13 +386,6 @@ 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 {