diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-14 22:56:16 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-14 22:56:16 +0000 |
| commit | bd0def2c9601236bd49063264963940fcf1e2459 (patch) | |
| tree | ceaad3889cb4798311b9f30556ebb08cc15ed8e2 | |
| parent | ad649c34cb4419bfdfce6edd101a805822395156 (diff) | |
| parent | 8ea8cfb8096378327530fb38306594cdf114c274 (diff) | |
| download | gitlab-ce-bd0def2c9601236bd49063264963940fcf1e2459.tar.gz | |
Merge branch '28142-overlap-bugs' into 'master'
Fix z index bugs
Closes #28142
See merge request !9236
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/28142-overlap-bugs.yml | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index da5c44b5fdc..a53cc27fac9 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -193,7 +193,6 @@ top: $header-height; bottom: 0; right: 0; - z-index: 8; transition: width .3s; background: $gray-light; padding: 10px 20px; diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 8fafe472621..948921efc0b 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -171,6 +171,8 @@ .tree-controls { float: right; margin-top: 11px; + position: relative; + z-index: 2; .project-action-button { margin-left: $btn-side-margin; diff --git a/changelogs/unreleased/28142-overlap-bugs.yml b/changelogs/unreleased/28142-overlap-bugs.yml new file mode 100644 index 00000000000..9fdabdf204a --- /dev/null +++ b/changelogs/unreleased/28142-overlap-bugs.yml @@ -0,0 +1,4 @@ +--- +title: Fix z index issues with sidebar +merge_request: +author: |