Commit 8e13aa14 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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
parents 4b996a98 265dbb12
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment