diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-02-12 16:58:01 +0100 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2020-02-12 16:58:03 +0100 |
commit | eb7c7a517902eae425b05d1ca9cb7f99f76ee71f (patch) | |
tree | 8fe379865fe1331616e8625ef4f6f488f1431536 | |
parent | 2779f29a66df9ad6fb162cfc9563e98fd137e223 (diff) | |
download | PeerTube-eb7c7a517902eae425b05d1ca9cb7f99f76ee71f.tar.gz PeerTube-eb7c7a517902eae425b05d1ca9cb7f99f76ee71f.tar.zst PeerTube-eb7c7a517902eae425b05d1ca9cb7f99f76ee71f.zip |
Fix user dropdown menu with long texts
closes #2480
-rw-r--r-- | client/src/app/menu/menu.component.html | 2 | ||||
-rw-r--r-- | client/src/sass/application.scss | 9 | ||||
-rw-r--r-- | client/src/sass/bootstrap.scss | 4 |
3 files changed, 14 insertions, 1 deletions
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html index b99c7308e..91422df77 100644 --- a/client/src/app/menu/menu.component.html +++ b/client/src/app/menu/menu.component.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <div class="logged-in-username">{{ user.username }}</div> | 11 | <div class="logged-in-username">{{ user.username }}</div> |
12 | </div> | 12 | </div> |
13 | 13 | ||
14 | <div class="logged-in-more" ngbDropdown placement="bottom-right auto"> | 14 | <div class="logged-in-more" ngbDropdown placement="bottom-right auto" container="body"> |
15 | <my-global-icon iconName="more-vertical" ngbDropdownToggle role="button"></my-global-icon> | 15 | <my-global-icon iconName="more-vertical" ngbDropdownToggle role="button"></my-global-icon> |
16 | 16 | ||
17 | <div ngbDropdownMenu> | 17 | <div ngbDropdownMenu> |
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index fa2452231..995cc6025 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -220,6 +220,15 @@ table { | |||
220 | font-weight: $font-semibold; | 220 | font-weight: $font-semibold; |
221 | } | 221 | } |
222 | 222 | ||
223 | .dropdown-item { | ||
224 | @include dropdown-with-icon-item; | ||
225 | |||
226 | my-global-icon { | ||
227 | width: 22px; | ||
228 | height: 22px; | ||
229 | } | ||
230 | } | ||
231 | |||
223 | @media screen and (max-width: 1600px) { | 232 | @media screen and (max-width: 1600px) { |
224 | .main-col { | 233 | .main-col { |
225 | &.expanded { | 234 | &.expanded { |
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index 330882fe4..2aca8c380 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss | |||
@@ -18,6 +18,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
18 | } | 18 | } |
19 | } | 19 | } |
20 | 20 | ||
21 | .dropdown { | ||
22 | z-index: 10001 !important; | ||
23 | } | ||
24 | |||
21 | .dropdown-menu { | 25 | .dropdown-menu { |
22 | border-radius: 3px; | 26 | border-radius: 3px; |
23 | box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2); | 27 | box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2); |