summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2016-08-09 14:44:43 -0500
committerClement Ho <ClemMakesApps@gmail.com>2016-08-25 09:34:39 -0500
commit77c22e95563f09e1430ac4fafcea4540463e3939 (patch)
tree4be1ffde455a069729b341afa2cb46ebbafe0989
parenta03da79fb2371ca0d866ce776bfb0bfe9f1be1df (diff)
downloadgitlab-ce-77c22e95563f09e1430ac4fafcea4540463e3939.tar.gz
Add font color contrast to external label in admin area
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/framework/nav.scss6
-rw-r--r--app/assets/stylesheets/pages/admin.scss4
3 files changed, 6 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 104f37003c9..e45a9479ea4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.12.0 (unreleased)
- Add two-factor recovery endpoint to internal API !5510
+ - Add font color contrast to external label in admin area (ClemMakesApps)
- Change merge_error column from string to text type
- Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel)
- Optimistic locking for Issues and Merge Requests (title and description overriding prevention)
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 9e924f99e9c..c72db86d958 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -71,7 +71,7 @@
.badge {
font-weight: normal;
background-color: #eee;
- color: #78a;
+ color: $btn-transparent-color;
vertical-align: baseline;
}
}
@@ -335,10 +335,6 @@
}
}
- .badge {
- color: $gl-icon-color;
- }
-
&:hover {
a, i {
color: $black;
diff --git a/app/assets/stylesheets/pages/admin.scss b/app/assets/stylesheets/pages/admin.scss
index c9cdfdcd29c..8f71381f5c4 100644
--- a/app/assets/stylesheets/pages/admin.scss
+++ b/app/assets/stylesheets/pages/admin.scss
@@ -96,6 +96,10 @@
line-height: inherit;
}
}
+
+ .label-default {
+ color: $btn-transparent-color;
+ }
}
.abuse-reports {