diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-13 10:51:50 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-13 10:51:50 +0000 |
commit | 8e13aa14782e09c7c28cea0d1ecfe12b151dab78 (patch) | |
tree | 9f55e4a83b7b29bad05e3b1d7ba7183e917d5fb6 /app/assets/stylesheets | |
parent | 4b996a98194b79b4b3dd080c29ea766c27a92d9e (diff) | |
parent | 265dbb12421c2fb2a67f32f3a3f5ea259b683065 (diff) | |
download | gitlab-ce-8e13aa14782e09c7c28cea0d1ecfe12b151dab78.tar.gz |
Merge branch '21895-horizontal-scroll-bar-present-in-collapsed-sidebar' into 'master'
Removed horizontal overflow from collapsed issuable sidebar
## What does this MR do?
Uses flexbox to remove any horizontal overflow from the collapsed issuable sidebar
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
There was a horizontal scrollbar at the bottom of all collapsed issuable sidebars as seen in the screenshot in #21895.
## Screenshots (if relevant)
![2016-09-11_16.28.30](/uploads/8e01565385b1ff0b736630ac3c24a3a1/2016-09-11_16.28.30.gif)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #21895.
See merge request !6295
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 63845e6b9ba..41079b6eeb5 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -206,7 +206,7 @@ padding-top: 0; .block { - width: $sidebar_collapsed_width - 1px; + width: $sidebar_collapsed_width - 2px; margin-left: -19px; padding: 15px 0 0; border-bottom: none; |