summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-10-13 08:46:30 +0000
committerRémy Coutable <remy@rymai.me>2017-10-13 08:46:30 +0000
commitfe3ec2d92149d999f379e9a49885c738b6fe41dd (patch)
tree27414704a4555726b139173f860007017a6fec20
parent2fd814a3285697f1803dd18dc7d9b29578757273 (diff)
parent6ca193f92cda73fd4df430a43999eadc10cafcbe (diff)
downloadgitlab-ce-fe3ec2d92149d999f379e9a49885c738b6fe41dd.tar.gz
Merge branch 'revert-8ae7963c' into 'master'
Revert "Merge branch '36160-select2-dropdown' into 'master'" See merge request gitlab-org/gitlab-ce!14851
-rw-r--r--app/assets/stylesheets/framework/selects.scss1
-rw-r--r--changelogs/unreleased/36160-select2-dropdown.yml5
2 files changed, 0 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss
index 58f6e62b06a..50f1445bc2e 100644
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -61,7 +61,6 @@
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
deleted file mode 100644
index a836744fb41..00000000000
--- a/changelogs/unreleased/36160-select2-dropdown.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Decreases z-index of select2 to a lower number of our navigation bar
-merge_request:
-author:
-type: fixed