summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-23 05:07:04 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-23 05:07:04 +0000
commit3f41eecff298d4dbdbc6bead4e9ac0b74e4a0b52 (patch)
treec148e30b3ced892fd1091882f7c97b00f3f31906
parent62948886fbec12f54563f738ccdb9be4a87ad349 (diff)
parent611bc0090a3bf5fff2f0fdab23299761413d6916 (diff)
downloadgitlab-ce-3f41eecff298d4dbdbc6bead4e9ac0b74e4a0b52.tar.gz
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) ![Screen_Shot_2016-06-22_at_00.31.26](/uploads/f49c7fa2b97b13e69f0dea97c5dfb319/Screen_Shot_2016-06-22_at_00.31.26.png) ## 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--app/assets/stylesheets/pages/labels.scss1
1 files changed, 1 insertions, 0 deletions
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 {