Merge remote-tracking branch 'upstream/pull/4171'

[rails.git] / app / views / layouts / _flash.html.erb

diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
index 5dda3ad5c88d717aea4101a5c2a1b701d801713b..eaf3078fe6ba9bf3f4155bedb57aa215920ea03d 100644 (file)
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,5 +1,5 @@
 <% if flash[:error] %>
 <% if flash[:error] %>

-  <div class="flash error row mx-0 p-3 align-items-center">
+  <div class="alert alert-danger row mx-0 mb-0 p-3 rounded-0 align-items-center">

     <div class="col-auto">
       <picture>
         <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml" />
     <div class="col-auto">
       <picture>
         <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml" />


@@ -11,7 +11,7 @@
 <% end %>
 
 <% if flash[:warning] %>
 <% end %>
 
 <% if flash[:warning] %>

-  <div class="flash warning row mx-0 p-3 align-items-center">
+  <div class="alert alert-warning row mx-0 mb-0 p-3 rounded-0 align-items-center">

     <div class="col-auto">
       <picture>
         <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>
     <div class="col-auto">
       <picture>
         <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>


@@ -23,7 +23,7 @@
 <% end %>
 
 <% if flash[:notice] %>
 <% end %>
 
 <% if flash[:notice] %>

-  <div class="flash notice row mx-0 p-3 align-items-center">
+  <div class="alert alert-success row mx-0 mb-0 p-3 rounded-0 align-items-center">

     <div class="col-auto">
       <picture>
         <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>
     <div class="col-auto">
       <picture>
         <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>