aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/src')
-rw-r--r--client/src/sass/bootstrap.scss12
-rw-r--r--client/src/sass/include/_bootstrap-variables.scss4
-rw-r--r--client/src/sass/include/_variables.scss12
3 files changed, 18 insertions, 10 deletions
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index e10b84596..6cced995e 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -22,11 +22,13 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
22 } 22 }
23} 23}
24 24
25.dropdown { 25/* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */
26.dropdown:not(.btn-group) {
26 z-index: z(dropdown) !important; 27 z-index: z(dropdown) !important;
27} 28}
28 29
29.dropdown-menu { 30.dropdown-menu {
31 z-index: z(dropdown) !important;
30 border-radius: 3px; 32 border-radius: 3px;
31 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); 33 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);
32 font-size: 15px; 34 font-size: 15px;
@@ -187,6 +189,14 @@ ngb-modal-window {
187 z-index: z(modal) !important; 189 z-index: z(modal) !important;
188} 190}
189 191
192ngb-popover-window {
193 z-index: z(popover) !important;
194}
195
196ngb-tooltip-window {
197 z-index: z(tooltip) !important;
198}
199
190.btn-outline-tertiary { 200.btn-outline-tertiary {
191 color: var(--secondaryColor); 201 color: var(--secondaryColor);
192 border-color: var(--secondaryColor); 202 border-color: var(--secondaryColor);
diff --git a/client/src/sass/include/_bootstrap-variables.scss b/client/src/sass/include/_bootstrap-variables.scss
index b3ab0eb2b..d536eac86 100644
--- a/client/src/sass/include/_bootstrap-variables.scss
+++ b/client/src/sass/include/_bootstrap-variables.scss
@@ -1,6 +1,5 @@
1$dropdown-link-active-bg: inherit; 1$dropdown-link-active-bg: inherit;
2 2
3$zindex-modal: 10005;
4$modal-footer-border-width: 0; 3$modal-footer-border-width: 0;
5$modal-md: 600px; 4$modal-md: 600px;
6 5
@@ -31,6 +30,3 @@ $input-focus-border-color: #ced4da;
31 30
32$nav-pills-link-active-bg: #F0F0F0; 31$nav-pills-link-active-bg: #F0F0F0;
33$nav-pills-link-active-color: #000; 32$nav-pills-link-active-color: #000;
34
35$zindex-dropdown: 10000;
36$zindex-popover: 10000;
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 3fb8bb625..0c37cd68a 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -104,13 +104,15 @@ $variables: (
104$zindex: ( 104$zindex: (
105 header : 1000, 105 header : 1000,
106 /* header context */ 106 /* header context */
107 headerLeft : 10, 107 headerLeft : 10,
108 menu : 11000, 108 menu : 11000,
109 dropdown : 12000, 109 dropdown : 12000,
110 loadbar : 13000, 110 popover : 13000,
111 modal : 14000, 111 tooltip : 14000,
112 notification : 15000, 112 loadbar : 15000,
113 hotkeys : 16000 113 modal : 16000,
114 notification : 17000,
115 hotkeys : 18000
114); 116);
115 117
116@function z($label) { 118@function z($label) {