diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-15 19:35:27 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-15 19:35:27 +0000 |
| commit | 102db0aaf162ec122d79e1aaff0f5ac3c86af373 (patch) | |
| tree | 26d8ec57cd8d710a3a67dbe3fb80e9cca17ee1c9 | |
| parent | 557dd8d9f04aa4c6a921356a074c86e0a47e38a3 (diff) | |
| parent | 4c34e0f3617be3eb597db3bfcd7514456575d8d5 (diff) | |
| download | gitlab-ce-102db0aaf162ec122d79e1aaff0f5ac3c86af373.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 c3ba62805dc..d92b6f9fe09 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -259,15 +259,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 |