summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-06-25 21:22:37 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-06-26 11:46:22 +0100
commit7e52dddac9bd3b428455dbc549958b3a310b261f (patch)
treefe2a75e12e570aca3326b62d71309b7fc9740147 /app
parent4bd36ec0322488972c7d8e215cde4dddd17e6a8e (diff)
downloadgitlab-ce-7e52dddac9bd3b428455dbc549958b3a310b261f.tar.gz
Merge branch 'fix-alert-btn' into 'master'
Fix alert button styling so that they don't show up white Closes #48407 See merge request gitlab-org/gitlab-ce!20163
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index efd2de8f218..67469c133cd 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -301,7 +301,7 @@ pre code {
color: $white-light;
h4,
- a,
+ a:not(.btn),
.alert-link {
color: $white-light;
}