diff --git a/CHANGELOG b/CHANGELOG index 104f37003c997bd2ee482b37f9e8d10391cbe47d..e45a9479ea48ab767fa4aafdbce6cee6396cb6f0 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 9e924f99e9c67fb32f25fa973d06320a4b856db2..c72db86d9589a38d5f66dcc0bf53407dd3715cc7 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 c9cdfdcd29c92b10c33824687933b7c80fbb8b5f..8f71381f5c4e671039d05d774459e6f3224af9f0 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 {