Commit 87dce571 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'issue/54169' into 'master'

added new styling to the `.flash-warning` styles and moved the bundled style...

See merge request gitlab-org/gitlab-ce!28916
parents ba2240ea 90e5fe55
...@@ -6,6 +6,19 @@ ...@@ -6,6 +6,19 @@
position: relative; position: relative;
z-index: 1; z-index: 1;
.flash-notice,
.flash-alert,
.flash-success,
.flash-warning {
border-radius: $border-radius-default;
color: $white-light;
.container-fluid,
.container-fluid.container-limited {
background: transparent;
}
}
.flash-notice { .flash-notice {
@extend .alert; @extend .alert;
background-color: $blue-500; background-color: $blue-500;
...@@ -28,7 +41,8 @@ ...@@ -28,7 +41,8 @@
.flash-warning { .flash-warning {
@extend .alert; @extend .alert;
background-color: $orange-500; background-color: $orange-100;
color: $orange-900;
margin: 0; margin: 0;
} }
...@@ -60,19 +74,6 @@ ...@@ -60,19 +74,6 @@
margin: 0; margin: 0;
} }
.flash-notice,
.flash-alert,
.flash-success,
.flash-warning {
border-radius: $border-radius-default;
color: $white-light;
.container-fluid,
.container-fluid.container-limited {
background: transparent;
}
}
&.flash-container-page { &.flash-container-page {
margin-bottom: 0; margin-bottom: 0;
......
---
title: "Rebrush of flash-warning according to the new design (brighter background and darker font)"
merge_request: 28916
author: Michel Engelen
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment