diff options
author | Chocobozzz <me@florianbigard.com> | 2020-11-20 14:19:23 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-11-20 14:19:23 +0100 |
commit | 8b57efbf1ba121cfd2e4ce326bf87ef887b2e80d (patch) | |
tree | 53e7ffd6bec193471c34ae85b8d4d7bbe155e5fd | |
parent | 939917705fa3fa93ab7036b5e7e9aaf5f1d0023e (diff) | |
download | PeerTube-8b57efbf1ba121cfd2e4ce326bf87ef887b2e80d.tar.gz PeerTube-8b57efbf1ba121cfd2e4ce326bf87ef887b2e80d.tar.zst PeerTube-8b57efbf1ba121cfd2e4ce326bf87ef887b2e80d.zip |
Fix dropdowns z-index
4 files changed, 4 insertions, 5 deletions
diff --git a/client/src/app/shared/shared-main/buttons/action-dropdown.component.html b/client/src/app/shared/shared-main/buttons/action-dropdown.component.html index 12933d4ca..8b363b351 100644 --- a/client/src/app/shared/shared-main/buttons/action-dropdown.component.html +++ b/client/src/app/shared/shared-main/buttons/action-dropdown.component.html | |||
@@ -7,7 +7,7 @@ | |||
7 | <my-global-icon *ngIf="!label && buttonDirection === 'vertical'" class="more-icon" iconName="more-vertical"></my-global-icon> | 7 | <my-global-icon *ngIf="!label && buttonDirection === 'vertical'" class="more-icon" iconName="more-vertical"></my-global-icon> |
8 | 8 | ||
9 | <span *ngIf="label" class="dropdown-toggle">{{ label }}</span> | 9 | <span *ngIf="label" class="dropdown-toggle">{{ label }}</span> |
10 | </button> | 10 | </button> |
11 | 11 | ||
12 | <div ngbDropdownMenu class="dropdown-menu"> | 12 | <div ngbDropdownMenu class="dropdown-menu"> |
13 | <ng-container *ngFor="let actions of getActions()"> | 13 | <ng-container *ngFor="let actions of getActions()"> |
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 aa117dcc6..ec004a407 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,8 +38,8 @@ | |||
38 | 38 | ||
39 | <my-edit-button *ngIf="owned && touchScreenEditButton" [routerLink]="[ '/my-library', 'video-playlists', playlist.uuid ]"></my-edit-button> | 39 | <my-edit-button *ngIf="owned && touchScreenEditButton" [routerLink]="[ '/my-library', 'video-playlists', playlist.uuid ]"></my-edit-button> |
40 | 40 | ||
41 | <div *ngIf="owned" class="more" ngbDropdown #moreDropdown="ngbDropdown" placement="left auto" | 41 | <div *ngIf="owned" class="more dropdown-root" ngbDropdown #moreDropdown="ngbDropdown" placement="left auto" |
42 | (openChange)="onDropdownOpenChange()" autoClose="outside" | 42 | (openChange)="onDropdownOpenChange()" autoClose="outside" container="body" |
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> |
45 | 45 | ||
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index 7cb149f5f..b90bffbfc 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss | |||
@@ -44,7 +44,6 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
44 | z-index: inherit !important; | 44 | z-index: inherit !important; |
45 | } | 45 | } |
46 | 46 | ||
47 | |||
48 | .dropdown-menu { | 47 | .dropdown-menu { |
49 | z-index: z(dropdown) + 1 !important; | 48 | z-index: z(dropdown) + 1 !important; |
50 | 49 | ||
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 7fe6efe32..b1e0431bb 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -127,7 +127,6 @@ $variables: ( | |||
127 | $zindex: ( | 127 | $zindex: ( |
128 | miniature : 10, | 128 | miniature : 10, |
129 | privacymsg : 20, | 129 | privacymsg : 20, |
130 | dropdown : 12000, | ||
131 | sub-menu : 12500, | 130 | sub-menu : 12500, |
132 | menu : 12600, | 131 | menu : 12600, |
133 | search-typeahead: 12650, | 132 | search-typeahead: 12650, |
@@ -136,6 +135,7 @@ $zindex: ( | |||
136 | tooltip : 14000, | 135 | tooltip : 14000, |
137 | loadbar : 15000, | 136 | loadbar : 15000, |
138 | modal : 16000, | 137 | modal : 16000, |
138 | dropdown : 17000, | ||
139 | help-popover : 17000, | 139 | help-popover : 17000, |
140 | notification : 18000, | 140 | notification : 18000, |
141 | hotkeys : 19000 | 141 | hotkeys : 19000 |