diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-06-25 21:22:37 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-06-25 21:22:37 +0000 |
| commit | 2ee1913f1ab411bf873c9085621cacfaf7502575 (patch) | |
| tree | 4b401ea0d0082455292d45c3ea10ca2ec8663194 | |
| parent | eb0416ae1704ea2460ed31b5e8053325cc0f3199 (diff) | |
| parent | 8951b6dadd7a1e14bc469283d3ddea50b58a8387 (diff) | |
| download | gitlab-ce-2ee1913f1ab411bf873c9085621cacfaf7502575.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
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-alert-btn.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index ba1f0a975a9..f610a1aea08 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -310,7 +310,7 @@ pre code { color: $white-light; h4, - a, + a:not(.btn), .alert-link { color: $white-light; } diff --git a/changelogs/unreleased/fix-alert-btn.yml b/changelogs/unreleased/fix-alert-btn.yml new file mode 100644 index 00000000000..d8bf561f05a --- /dev/null +++ b/changelogs/unreleased/fix-alert-btn.yml @@ -0,0 +1,5 @@ +--- +title: Fix alert button styling so that they don't show up white +merge_request: +author: +type: fixed |