summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-10-10 20:18:32 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-10-10 20:18:32 +0000
commit8ae7963cd027cd91d3d9a1fa635b7071c941f60f (patch)
treee03991f82429b3ef20aee6cb18aaccf3f734312e
parentfe11c5fde7c0c748eb370f09715114fd5a7d8577 (diff)
parent33faadc15fb525bb39da6aa9bedfed91bcbc8737 (diff)
downloadgitlab-ce-8ae7963cd027cd91d3d9a1fa635b7071c941f60f.tar.gz
Merge branch '36160-select2-dropdown' into 'master'
Decreases z-index of select2 to a lower number than our navigation bar Closes #36160 See merge request gitlab-org/gitlab-ce!14768
-rw-r--r--app/assets/stylesheets/framework/selects.scss1
-rw-r--r--changelogs/unreleased/36160-select2-dropdown.yml5
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss
index 50f1445bc2e..58f6e62b06a 100644
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -61,6 +61,7 @@
border: 1px solid $dropdown-border-color;
min-width: 175px;
color: $gl-text-color;
+ z-index: 999;
}
.select2-drop.select2-drop-above.select2-drop-active {
diff --git a/changelogs/unreleased/36160-select2-dropdown.yml b/changelogs/unreleased/36160-select2-dropdown.yml
new file mode 100644
index 00000000000..a836744fb41
--- /dev/null
+++ b/changelogs/unreleased/36160-select2-dropdown.yml
@@ -0,0 +1,5 @@
+---
+title: Decreases z-index of select2 to a lower number of our navigation bar
+merge_request:
+author:
+type: fixed