diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-06 14:57:27 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-06 14:57:27 +0000 |
commit | aa152e4a275434949ade20d20b5dc30d23d1bba9 (patch) | |
tree | b63b66163428b7dc22ae552a7a1e3f3aceccf7bf | |
parent | 5a3ccf22c553f2d5c1ee196ff6931b3518127977 (diff) | |
parent | 3f06d7abe46d74ca3610f94740e2770bc26cbf9e (diff) | |
download | gitlab-ce-aa152e4a275434949ade20d20b5dc30d23d1bba9.tar.gz |
Merge branch 'cleanup-mislignments-issue-list-view' into 'master'
increased checkbox and filter button padding
## What does this MR do?
fixed misalignments as described in https://gitlab.com/gitlab-org/gitlab-ce/issues/19110
## Are there points in the code the reviewer needs to double check?
Not that I know of
## Why was this MR needed?
https://gitlab.com/gitlab-org/gitlab-ce/issues/19110
## Screenshots (if relevant)
![image](/uploads/e7c5ffe78e1a5b67fa0335ba1c231df2/image.png)
![image](/uploads/1591ed872e765da3b5ed071c8872194f/image.png)
## Does this MR meet the acceptance criteria?
- [x] [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)
- [x] 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 https://gitlab.com/gitlab-org/gitlab-ce/issues/19110
See merge request !6206
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 41522857f82..17388615908 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.12.0 (unreleased) + - Cleanup misalignments in Issue list view !6206 - Prepend blank line to `Closes` message on merge request linked to issue (lukehowell) - Filter tags by name !6121 - Make push events have equal vertical spacing. diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 9efbaf54e90..553768b2e68 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -138,7 +138,7 @@ } li a { - padding: 16px 10px 11px; + padding: 16px 15px 11px; } /* Small devices (phones, tablets, 768px and lower) */ diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 910700b0206..d14224ed00f 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -9,7 +9,7 @@ .issue-check { float: left; - padding-right: 8px; + padding-right: 16px; margin-bottom: 10px; min-width: 15px; |