diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-23 08:07:04 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-23 21:34:43 +0300 |
| commit | 0d8437ec0b74570c0536b4464a0add8d4a569f26 (patch) | |
| tree | d687f93d3b7c37c72c5c0ccbcc38d7883d8abd24 | |
| parent | 060c4a506e138b081f7b0b862bbb3498b341ac14 (diff) | |
Merge branch '18857-new-label-page-needs-work-on-mobile' into 'master'
Added bottom padding to label color suggestion link
## What does this MR do?
Adds a bottom margin to label color suggestions to make sure that when wrapped there is enough whitespace between color rows.
## Are there points in the code the reviewer needs to double check?
:confused:
## Why was this MR needed?
Mobile UX.
## What are the relevant issue numbers?
Closes #18857.
## Screenshots (if relevant)
## 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
- [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 !4845
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 9d5a3e50609..d68e5d35e30 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,7 @@ v 8.9.1 (unreleased) - Handle external issues in IssueReferenceFilter. !4789 - Update Todos documentation and screenshots to include new functionality. !4840 - Hide nav arrows by default. !4843 + - Added bottom padding to label color suggestion link. !4845 v 8.9.0 - Fix builds API response not including commit data diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index f5f67e2cd84..47bfd144930 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -6,6 +6,7 @@ height: 30px; display: inline-block; margin-right: 10px; + margin-bottom: 10px; } &.suggest-colors-dropdown { |