aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-08-19 11:35:01 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-08-25 14:42:16 +0200
commitd6eace77dbc6ddde958ea1e38286fd68a0398768 (patch)
treea45a2c076e40a0491c353e6ea88ed8c38f11b5b2
parent2856af48ac79d614c79ed9e962d70564afbec1e1 (diff)
downloadPeerTube-d6eace77dbc6ddde958ea1e38286fd68a0398768.tar.gz
PeerTube-d6eace77dbc6ddde958ea1e38286fd68a0398768.tar.zst
PeerTube-d6eace77dbc6ddde958ea1e38286fd68a0398768.zip
Fix playlist element dropdown overflow
-rw-r--r--client/src/app/header/search-typeahead.component.scss2
-rw-r--r--client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html2
-rw-r--r--client/src/sass/application.scss2
-rw-r--r--client/src/sass/bootstrap.scss2
-rw-r--r--client/src/sass/include/_variables.scss27
5 files changed, 18 insertions, 17 deletions
diff --git a/client/src/app/header/search-typeahead.component.scss b/client/src/app/header/search-typeahead.component.scss
index 87e8b8c70..f8d68e986 100644
--- a/client/src/app/header/search-typeahead.component.scss
+++ b/client/src/app/header/search-typeahead.component.scss
@@ -28,7 +28,7 @@
28.jump-to-suggestions { 28.jump-to-suggestions {
29 top: 100%; 29 top: 100%;
30 left: 0; 30 left: 0;
31 z-index: z(typeahead); 31 z-index: z('search-typeahead');
32 width: 100%; 32 width: 100%;
33} 33}
34 34
diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html
index 473fdc102..87ab68b87 100644
--- a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html
+++ b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html
@@ -38,7 +38,7 @@
38 38
39 <my-edit-button *ngIf="owned && touchScreenEditButton" [routerLink]="[ '/my-account', 'video-playlists', playlist.uuid ]"></my-edit-button> 39 <my-edit-button *ngIf="owned && touchScreenEditButton" [routerLink]="[ '/my-account', 'video-playlists', playlist.uuid ]"></my-edit-button>
40 40
41 <div *ngIf="owned" class="more" ngbDropdown #moreDropdown="ngbDropdown" placement="bottom auto" 41 <div *ngIf="owned" class="more" ngbDropdown #moreDropdown="ngbDropdown" placement="left auto"
42 (openChange)="onDropdownOpenChange()" autoClose="outside" 42 (openChange)="onDropdownOpenChange()" autoClose="outside"
43 > 43 >
44 <my-global-icon iconName="more-vertical" ngbDropdownToggle role="button" class="icon-more" (click)="$event.preventDefault()"></my-global-icon> 44 <my-global-icon iconName="more-vertical" ngbDropdownToggle role="button" class="icon-more" (click)="$event.preventDefault()"></my-global-icon>
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 3be8f057b..351676a38 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -161,7 +161,7 @@ code {
161 161
162 &.sub-menu-fixed { 162 &.sub-menu-fixed {
163 position: fixed; 163 position: fixed;
164 z-index: #{z('header') - 1}; 164 z-index: #{z('sub-menu') - 1};
165 } 165 }
166 } 166 }
167 167
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index 58256a065..259af7a77 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -176,7 +176,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
176 content: ''; 176 content: '';
177 display: block; 177 display: block;
178 position: fixed; 178 position: fixed;
179 z-index: z('header') - 1; 179 z-index: z('menu') - 1;
180 } 180 }
181 } 181 }
182 } 182 }
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index a7ad0f643..565f9b512 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -124,19 +124,20 @@ $variables: (
124/*** z-index groups ***/ 124/*** z-index groups ***/
125 125
126$zindex: ( 126$zindex: (
127 miniature : 10, 127 miniature : 10,
128 privacymsg : 20, 128 privacymsg : 20,
129 typeahead : 30, 129 dropdown : 12000,
130 dropdown : 12000, 130 sub-menu : 12500,
131 header : 12500, 131 menu : 12600,
132 menu : 12600, 132 search-typeahead: 12650,
133 popover : 13000, 133 header : 12700,
134 tooltip : 14000, 134 popover : 13000,
135 loadbar : 15000, 135 tooltip : 14000,
136 modal : 16000, 136 loadbar : 15000,
137 help-popover : 17000, 137 modal : 16000,
138 notification : 18000, 138 help-popover : 17000,
139 hotkeys : 19000 139 notification : 18000,
140 hotkeys : 19000
140); 141);
141 142
142@function z($label) { 143@function z($label) {