summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-12-13 13:15:34 +0000
committerFatih Acet <acetfatih@gmail.com>2016-12-13 13:15:34 +0000
commit8f299a5825997eb279011d67565689d506bf7d66 (patch)
treeb378098414d15a3dadc38c02ac70a465fdaa169a /app
parentbd219711b99a31025614bf5715b35a140baf50b6 (diff)
parent9d097ebdb5396ad6fdb93301417fc7de5f71eff7 (diff)
downloadgitlab-ce-8f299a5825997eb279011d67565689d506bf7d66.tar.gz
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
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
-rw-r--r--app/assets/stylesheets/pages/issuable.scss1
-rw-r--r--app/assets/stylesheets/pages/labels.scss3
3 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 18716813c48..a1d5f6427f4 100644
--- 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
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 90587b9425b..407c0afbac8 100644
--- 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;
}
}
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index b1ccd644450..25c91203ff4 100644
--- 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 {