diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-15 19:35:27 +0000 |
|---|---|---|
| committer | Chris Peressini <cperessini@gitlab.com> | 2018-06-18 10:46:14 +0200 |
| commit | efe71b03391d11b3ef8dcd3ca0c1681289ec9ce8 (patch) | |
| tree | 9a0a82c908efeab4aad843984bc8182268cf6c4f | |
| parent | bcf3400254577a87c35c9ef7b92c277789a5807b (diff) | |
| download | gitlab-ce-efe71b03391d11b3ef8dcd3ca0c1681289ec9ce8.tar.gz | |
Merge branch 'fix-alert-colors' into 'master'
Fix alert colors
Closes #47983
See merge request gitlab-org/gitlab-ce!19905
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 23 | ||||
| -rw-r--r-- | app/views/help/ui.html.haml | 2 |
2 files changed, 22 insertions, 3 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 5da0e672288..c6d63d9bcbf 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -264,15 +264,36 @@ pre code { white-space: pre-wrap; } +.alert, +.flash-notice { + border-radius: 0; +} + +.alert-success { + background-color: $green-500; + border-color: $green-500; +} + +.alert-info { + background-color: $blue-500; + border-color: $blue-500; +} + +.alert-warning { + background-color: $orange-500; + border-color: $orange-500; +} + .alert-danger { background-color: $red-500; border-color: $red-500; } +.alert-success, +.alert-info, .alert-warning, .alert-danger, .flash-notice { - border-radius: 0; color: $white-light; h4, diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index de8369ed7b9..b32b602ceb3 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -443,8 +443,6 @@ .col-md-6 .alert.alert-success = lorem - .alert.alert-primary - = lorem .alert.alert-info = lorem .col-md-6 |