Merge branch '36160-zindex' into 'master'

Decreases z-index of select2 to a lower number of our navigation bar Closes #36160 See merge request gitlab-org/gitlab-ce!14925

Merge branch '36160-zindex' into 'master'
00c15cc2 · Annabel Dunstone Gray · 9c71fb0d · ceffdf97 · 00c15cc2 · 00c15cc2
Commit 00c15cc2 authored Oct 18, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

selects.scss app/assets/stylesheets/framework/selects.scss +5 -0

36160-zindex.yml changelogs/unreleased/36160-zindex.yml +5 -0

No files found.
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -61,6 +61,11 @@
  border: 1px solid $dropdown-border-color;
  min-width: 175px;
  color: $gl-text-color;
+  z-index: 999;
+}
+
+.select2-drop-mask {
+  z-index: 998;
 }

 .select2-drop.select2-drop-above.select2-drop-active {

--- a/changelogs/unreleased/36160-zindex.yml
+++ b/changelogs/unreleased/36160-zindex.yml
+---
+title: Decreases z-index of select2 to a lower number of our navigation bar
+merge_request:
+author:
+type: fixed