diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-27 15:29:28 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-27 15:29:28 +0000 |
| commit | 53086e110c7c1587ad326d5598aa06ba0d2b1443 (patch) | |
| tree | eea364578530eb9c32e4a412d20b881142b99837 | |
| parent | e5950e687c42db006daf9147254e111f4e68c3f1 (diff) | |
| parent | 30bd346e5f4379c0a55a6ad696f705470b6a7740 (diff) | |
| download | gitlab-ce-53086e110c7c1587ad326d5598aa06ba0d2b1443.tar.gz | |
Merge branch '23866-builds-dropdown' into 'master'
Increase z index on fixed mr tabs
Before:
<img src="/uploads/e890a4f185af87b66251d744fbe840d5/Screen_Shot_2016-10-26_at_11.58.45_AM.png" width="400px">
After:
<img src="/uploads/0bbf72888f6a47bd3027ee7dfff542da/Screen_Shot_2016-10-26_at_11.58.28_AM.png" width="400px">
Closes #23866
See merge request !7124
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index fc589e838be..447a5614e75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,9 @@ Please view this file on the master branch, on stable branches it's out of date. - Fix documents and comments on Build API `scope` - Refactor email, use setter method instead AR callbacks for email attribute (Semyon Pupkov) +## 8.13.2 + - Fix builds dropdown overlapping bug !7124 + ## 8.13.1 (2016-10-25) - Fix branch protection API. !6215 - Fix hidden pipeline graph on commit and MR page. !6895 diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 70afa568554..33f09722274 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -439,12 +439,12 @@ } .merge-request-tabs-holder { - background-color: #fff; + background-color: $white-light; &.affix { top: 100px; left: 0; - z-index: 9; + z-index: 10; transition: right .15s; } |