summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitrie Hoekstra <dimitriehoekstra@gmail.com>2016-12-16 12:51:12 +0100
committerDimitrie Hoekstra <dimitriehoekstra@gmail.com>2016-12-16 12:51:12 +0100
commit9046b583ff61d74c8e481053d150da924d129ad8 (patch)
tree101eaa31bff17a063ab8e2ef10621443eff93ef4
parent4af64c3e4e198fa0499dae585f830c814193cb5e (diff)
downloadgitlab-ce-badge-color-on-white-bg.tar.gz
fixed variable, plus added light text color for light badgesbadge-color-on-white-bg
-rw-r--r--app/assets/stylesheets/framework/badges.scss1
-rw-r--r--app/assets/stylesheets/framework/variables.scss3
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/badges.scss b/app/assets/stylesheets/framework/badges.scss
index 89e1c7890d8..e9d7cda0647 100644
--- a/app/assets/stylesheets/framework/badges.scss
+++ b/app/assets/stylesheets/framework/badges.scss
@@ -7,4 +7,5 @@
.badge-dark {
background-color: $badge-bg-dark;
+ color: $badge-color-dark;
}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index cdc54fdc254..288bb67c4bf 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -281,7 +281,8 @@ $btn-active-gray-light: e4e7ed;
*/
$badge-bg: #f3f3f3;
$badge-bg-dark: #eee;
-$badge-color: $btn-transparent-color;
+$badge-color: #929292;
+$badge-color-dark: #8f8f8f;
/*
* Award emoji