diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-07 18:11:06 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-07 18:11:06 +0000 |
commit | e15cb9e3a72ad5ccdbb58d28a66a16d0a7185b7b (patch) | |
tree | 9dfbcc11bd806f564c7001e3752b520f0b97257b | |
parent | f3f0e0db8ac07bc653b449511905b9c963648710 (diff) | |
parent | ddfa2be04c6bf6144102b6c7cb1aba4e308fe23b (diff) | |
download | gitlab-ce-e15cb9e3a72ad5ccdbb58d28a66a16d0a7185b7b.tar.gz |
Merge branch '27639-emoji-panel-under-the-side-panel-in-the-merge-request' into 'master'
Layer dropdowns over right sidebar
Closes #27639
See merge request !9004
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 | ||||
-rw-r--r-- | changelogs/unreleased/27639-emoji-panel-under-the-side-panel-in-the-merge-request.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 4ef95d27f4f..9174976c4c6 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -193,7 +193,7 @@ top: $header-height; bottom: 0; right: 0; - z-index: 10; + z-index: 8; transition: width .3s; background: $gray-light; padding: 10px 20px; diff --git a/changelogs/unreleased/27639-emoji-panel-under-the-side-panel-in-the-merge-request.yml b/changelogs/unreleased/27639-emoji-panel-under-the-side-panel-in-the-merge-request.yml new file mode 100644 index 00000000000..0531ef2c038 --- /dev/null +++ b/changelogs/unreleased/27639-emoji-panel-under-the-side-panel-in-the-merge-request.yml @@ -0,0 +1,4 @@ +--- +title: Layer award emoji dropdown over the right sidebar +merge_request: 9004 +author: |