aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/menu/menu.component.scss4
-rw-r--r--client/src/sass/bootstrap.scss19
-rw-r--r--client/src/sass/include/_variables.scss4
3 files changed, 20 insertions, 7 deletions
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 407d79725..975604055 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -241,6 +241,10 @@ menu {
241 } 241 }
242} 242}
243 243
244.dropdown {
245 z-index: #{z('menu') + 1} !important;
246}
247
244.dropdown-menu { 248.dropdown-menu {
245 width: calc(100% + 40px); 249 width: calc(100% + 40px);
246} 250}
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index a3b60198c..58256a065 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -27,15 +27,24 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
27} 27}
28 28
29/* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */ 29/* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */
30.dropdown:not(.btn-group):not(.dropdown-root):not(.action-dropdown):not(.input-group-prepend):not(.column-toggle) { 30.dropdown {
31 z-index: z(dropdown) !important; 31 z-index: z(dropdown) !important;
32}
32 33
33 &.list-overflow-menu, 34.list-overflow-menu,
34 &.parent-entry { 35.parent-entry {
35 z-index: z(header) - 1 !important; 36 z-index: z(header) - 1 !important;
36 }
37} 37}
38 38
39.btn-group,
40.dropdown-root,
41.action-dropdown,
42.input-group-prepend,
43.column-toggle {
44 z-index: inherit !important;
45}
46
47
39.dropdown-menu { 48.dropdown-menu {
40 z-index: z(dropdown) + 1 !important; 49 z-index: z(dropdown) + 1 !important;
41 50
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 130462b89..a7ad0f643 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -127,9 +127,9 @@ $zindex: (
127 miniature : 10, 127 miniature : 10,
128 privacymsg : 20, 128 privacymsg : 20,
129 typeahead : 30, 129 typeahead : 30,
130 header : 1000,
131 menu : 11000,
132 dropdown : 12000, 130 dropdown : 12000,
131 header : 12500,
132 menu : 12600,
133 popover : 13000, 133 popover : 13000,
134 tooltip : 14000, 134 tooltip : 14000,
135 loadbar : 15000, 135 loadbar : 15000,