diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-18 19:09:01 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-18 19:09:01 +0000 |
commit | 00c15cc27c33dd387069fce5777beb29d01f55ac (patch) | |
tree | e38f64b6d76170864446e5e446b5f1b7433c061a | |
parent | 9c71fb0de2f0a7482b1a59c673142981ecdab26f (diff) | |
parent | ceffdf97151fb1feafdfa63ef04fb6c7d6d6e27d (diff) | |
download | gitlab-ce-00c15cc27c33dd387069fce5777beb29d01f55ac.tar.gz |
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
-rw-r--r-- | app/assets/stylesheets/framework/selects.scss | 5 | ||||
-rw-r--r-- | changelogs/unreleased/36160-zindex.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index 50f1445bc2e..621eec4f158 100644 --- 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 { diff --git a/changelogs/unreleased/36160-zindex.yml b/changelogs/unreleased/36160-zindex.yml new file mode 100644 index 00000000000..a836744fb41 --- /dev/null +++ b/changelogs/unreleased/36160-zindex.yml @@ -0,0 +1,5 @@ +--- +title: Decreases z-index of select2 to a lower number of our navigation bar +merge_request: +author: +type: fixed |