summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2018-11-27 15:52:13 +0100
committerFatih Acet <acetfatih@gmail.com>2018-11-27 16:11:47 +0100
commitbba98475266fa08dcc88b373c5ad1131fb72caa8 (patch)
treee292920397a7e329f52df0f43e7784a81b49c70a
parentd933731ae9db6b053be0c61029bc06d9c9dee67c (diff)
downloadgitlab-ce-bba98475266fa08dcc88b373c5ad1131fb72caa8.tar.gz
Always prefer flash-text as display block
-rw-r--r--app/assets/stylesheets/framework/flash.scss10
-rw-r--r--changelogs/unreleased/_acet-fix-flash-styling.yml5
2 files changed, 10 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/flash.scss b/app/assets/stylesheets/framework/flash.scss
index 7a4c3914fb0..afa85f0e4ae 100644
--- a/app/assets/stylesheets/framework/flash.scss
+++ b/app/assets/stylesheets/framework/flash.scss
@@ -32,16 +32,16 @@
margin: 0;
}
+ .flash-text,
+ .flash-action {
+ display: inline-block;
+ }
+
.flash-alert {
@extend .alert;
background-color: $red-500;
margin: 0;
- .flash-text,
- .flash-action {
- display: inline-block;
- }
-
.flash-action {
margin-left: 5px;
text-decoration: none;
diff --git a/changelogs/unreleased/_acet-fix-flash-styling.yml b/changelogs/unreleased/_acet-fix-flash-styling.yml
new file mode 100644
index 00000000000..57354c04899
--- /dev/null
+++ b/changelogs/unreleased/_acet-fix-flash-styling.yml
@@ -0,0 +1,5 @@
+---
+title: Fix flash notice styling for fluid layout
+merge_request: 23382
+author:
+type: fixed