Merge branch '25518-uniquely-style-labels' into 'master'

added border-radius and padding to labels ## What does this MR do? It creates a pill like style for labels. ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? get a unique label look/style ## Screenshots (if relevant) ![image](/uploads/2cf347984ae4e36cd061c5a761ee99c9/image.png) ![image](/uploads/c23bbeba4b2525b4f36dac5a0fa1037c/image.png) ## Does this MR meet the acceptance criteria? - [ ] [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? Closes #25518 See merge request !8054

Merge branch '25518-uniquely-style-labels' into 'master'
8f299a58 · Fatih Acet · bd219711 · 9d097ebd · 8f299a58 · 8f299a58
Commit 8f299a58 authored Dec 13, 2016 by Fatih Acet
Showing with 4 additions and 1 deletion

variables.scss app/assets/stylesheets/framework/variables.scss +1 -0

issuable.scss app/assets/stylesheets/pages/issuable.scss +1 -0

labels.scss app/assets/stylesheets/pages/labels.scss +2 -1

No files found.
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -486,6 +486,7 @@ $jq-ui-default-color: #777;
 $label-gray-bg: #f8fafc;
 $label-inverse-bg: #333;
 $label-remove-border: rgba(0, 0, 0, .1);
+$label-border-radius: 14px;

 /*
 * Lint

--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -30,6 +30,7 @@

    .color-label {
      padding: 6px 10px;
+      border-radius: $label-border-radius;
    }
  }


--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -104,7 +104,8 @@
 }

 .color-label {
-  padding: 3px 4px;
+  padding: 3px 7px;
+  border-radius: $label-border-radius;
 }

 .dropdown-labels-error {