summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDimitrie Hoekstra <dimitriehoekstra@gmail.com>2016-12-16 11:59:10 +0100
committerDimitrie Hoekstra <dimitriehoekstra@gmail.com>2016-12-16 11:59:10 +0100
commit2490f804cd4c12533fd6c70fc8014a06f2d19d47 (patch)
treeec8848ebd118c8ced8bdd99b362bceefa7fc06f6 /app
parentecd0c1757da536c5b522dad563b6621d0d5634b1 (diff)
downloadgitlab-ce-2490f804cd4c12533fd6c70fc8014a06f2d19d47.tar.gz
Additional rounded label fixes
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/variables.scss2
-rw-r--r--app/assets/stylesheets/pages/labels.scss4
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 936aaf38254..d201a538195 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -436,7 +436,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;
+$label-border-radius: 100px;
/*
* Lint
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 25c91203ff4..703a429d63c 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 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 {