diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-07-20 13:43:34 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-07-20 13:43:34 +0000 |
commit | f3d03af4215763d6c51c4b26702200ba679baded (patch) | |
tree | ab73fb083d2d9fe5e3626b91c01de9bee8e42783 /app/assets/stylesheets/framework/blocks.scss | |
parent | 12c4fb1b0f5620fdda7f358280c3feeb3ea7d47f (diff) | |
parent | 893cc5ec01b02a7183ae28ce815d6d14d0dfdeff (diff) | |
download | gitlab-ce-f3d03af4215763d6c51c4b26702200ba679baded.tar.gz |
Merge branch 'issue-19641' into 'master'
Fix Issue 19641 (new snippets style bug)
## What does this MR do?
Fixes Issue 19641 (new snippets style bug)
## Are there points in the code the reviewer needs to double check?
Shouldn't be
## Why was this MR needed?
Requested in issue 19641 by Fatih Acet https://gitlab.com/gitlab-org/gitlab-ce/issues/19641
## What are the relevant issue numbers?
19641
## Screenshots (if relevant)
![Screenshot_2016-07-09_13.25.39](/uploads/8ead7ea8f4aae7ccaa4d2ddc495b6fe3/Screenshot_2016-07-09_13.25.39.png)
## Does this MR meet the acceptance criteria?
Yes
- [ x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ NA] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ NA] API support added
- Tests
- [NA ] Added for this feature/bug
- [ X] All builds are passing
- [X ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5170
Diffstat (limited to 'app/assets/stylesheets/framework/blocks.scss')
-rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index ad94e457cfd..7ce203d2ec7 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -232,7 +232,9 @@ .nav-block { .controls { float: right; - margin-top: 11px; + margin-top: 8px; + padding-bottom: 7px; + border-bottom: 1px solid $border-color; } } |