aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss7
-rw-r--r--client/src/sass/bootstrap.scss7
-rw-r--r--client/src/sass/include/_variables.scss5
3 files changed, 14 insertions, 5 deletions
diff --git a/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss b/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss
index b42be318f..a6479c7ec 100644
--- a/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss
+++ b/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss
@@ -25,6 +25,13 @@
25 } 25 }
26} 26}
27 27
28// Avoid higher z-index when overlay on touchscreens
29:host-context(.menu-open) {
30 .privacy-concerns {
31 z-index: z(overlay) - 1;
32 }
33}
34
28// Or if we are in the small view 35// Or if we are in the small view
29@media screen and (max-width: $small-view) { 36@media screen and (max-width: $small-view) {
30 .privacy-concerns { 37 .privacy-concerns {
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index 058033166..4f6e08c1b 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -59,13 +59,14 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
59} 59}
60 60
61/* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */ 61/* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */
62.dropdown { 62.dropdown,
63.dropup {
63 z-index: z(dropdown) !important; 64 z-index: z(dropdown) !important;
64} 65}
65 66
66.list-overflow-menu, 67.list-overflow-menu,
67.parent-entry { 68.parent-entry {
68 z-index: z(header) - 1 !important; 69 z-index: z(menu) - 1 !important;
69} 70}
70 71
71.btn-group, 72.btn-group,
@@ -213,7 +214,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
213 content: ''; 214 content: '';
214 display: block; 215 display: block;
215 position: fixed; 216 position: fixed;
216 z-index: z('menu') - 1; 217 z-index: z(overlay);
217 } 218 }
218 } 219 }
219 } 220 }
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 39e81f270..e0a4c7d3f 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -159,17 +159,18 @@ $variables: (
159 159
160$zindex: ( 160$zindex: (
161 miniature : 10, 161 miniature : 10,
162 privacymsg : 20,
163 sub-menu : 12500, 162 sub-menu : 12500,
163 overlay : 12550,
164 menu : 12600, 164 menu : 12600,
165 search-typeahead: 12650, 165 search-typeahead: 12650,
166 header : 12700,
167 popover : 13000, 166 popover : 13000,
168 tooltip : 14000, 167 tooltip : 14000,
169 loadbar : 15000, 168 loadbar : 15000,
170 modal : 16000, 169 modal : 16000,
171 dropdown : 17000, 170 dropdown : 17000,
172 help-popover : 17000, 171 help-popover : 17000,
172 privacymsg : 17500,
173 header : 17500,
173 notification : 18000, 174 notification : 18000,
174 hotkeys : 19000 175 hotkeys : 19000
175); 176);