summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-12-16 20:34:41 +0000
committerFatih Acet <acetfatih@gmail.com>2016-12-16 20:34:41 +0000
commite7b995e85f5a1be5c52cdb44b8df89da7372e814 (patch)
tree9266cd2b7e06b6ccdff4e65dde8f268f1e9cf756 /app/assets/stylesheets/pages
parentfb16b01faab577af781386b9a68336213117b689 (diff)
parent595da33d738041cf0b2c28a87989aa271f5019cc (diff)
downloadgitlab-ce-e7b995e85f5a1be5c52cdb44b8df89da7372e814.tar.gz
Merge branch 'rounded-labels-fixes' into 'master'
Additional rounded label fixes ## What does this MR do? fixes some UI bugs for the change to rounded labels ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? / Screenshots (if relevant) before: ![image](/uploads/ce359bb021fee324156f050b3f848c2e/image.png) after: ![image](/uploads/a5f0d536db3efdce4ff994deb0d73081/image.png) these now have full rounded border-radius as well :) ![image](/uploads/d331eae2c32dd043766b4148f9ad88e9/image.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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? - See merge request !8136
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r--app/assets/stylesheets/pages/labels.scss4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 25c91203ff4..d129eb12a45 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -98,7 +98,7 @@
}
.label {
- padding: 9px;
+ padding: 8px 9px 9px;
font-size: 14px;
}
}
@@ -201,6 +201,8 @@
.label-remove {
border-left: 1px solid $label-remove-border;
z-index: 3;
+ border-radius: $label-border-radius;
+ padding: 6px 10px 6px 9px;
}
.btn {