diff options
author | Dimitrie Hoekstra <dimitriehoekstra@gmail.com> | 2016-12-13 01:28:57 +0100 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-13 14:29:49 +0300 |
commit | 9d097ebdb5396ad6fdb93301417fc7de5f71eff7 (patch) | |
tree | ff8d62c39f81eb4967f5b68edfb4d78142612d1f /app | |
parent | b544ec8670f8a14d205fa0b13e8ca37fad795686 (diff) | |
download | gitlab-ce-9d097ebdb5396ad6fdb93301417fc7de5f71eff7.tar.gz |
added border-radius and padding to labels25518-uniquely-style-labels
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 3 |
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 { |