From bba98475266fa08dcc88b373c5ad1131fb72caa8 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Tue, 27 Nov 2018 15:52:13 +0100
Subject: [PATCH] Always prefer flash-text as display block

---
 app/assets/stylesheets/framework/flash.scss       | 10 +++++-----
 changelogs/unreleased/_acet-fix-flash-styling.yml |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 changelogs/unreleased/_acet-fix-flash-styling.yml

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