1 files changed, 28 insertions, 6 deletions

diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index 330882fe4..6cced995e 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -9,6 +9,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   animation: spin .7s infinite linear;
 }
 
+.flex-auto {
+  flex: auto;
+}
+
 @keyframes spin {
   from {
     transform: scale(1) rotate(0deg);
@@ -18,7 +22,13 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   }
 }
 
+/* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */
+.dropdown:not(.btn-group) {
+  z-index: z(dropdown) !important;
+}
+
 .dropdown-menu {
+  z-index: z(dropdown) !important;
   border-radius: 3px;
   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);
   font-size: 15px;
@@ -26,8 +36,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   .dropdown-item {
     padding: 3px 15px;
 
-    &:active {
-      color: #000 !important;
+    &.active {
+      color: var(--mainBackgroundColor) !important;
+      background-color: var(--mainHoverColor);
+      opacity: .9;
     }
   }
 
@@ -42,16 +54,14 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 }
 
 
-@media screen and (min-width: 768px) {
+@media screen and (min-width: #{map-get($grid-breakpoints, md)}) {
   .modal:before {
-    display: inline-block;
     vertical-align: middle;
     content: " ";
     height: 100%;
   }
 
   .modal-dialog {
-    display: inline-block;
     text-align: left;
     vertical-align: middle;
     min-width: 500px;
@@ -172,7 +182,19 @@ ngb-tabset.bootstrap {
 }
 
 ngb-modal-backdrop {
-  z-index: 10000 !important;
+  z-index: z(modal) - 1 !important;
+}
+
+ngb-modal-window {
+  z-index: z(modal) !important;
+}
+
+ngb-popover-window {
+  z-index: z(popover) !important;
+}
+
+ngb-tooltip-window {
+  z-index: z(tooltip) !important;
 }
 
 .btn-outline-tertiary {