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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index fe36932675dbdd9fac796e97954ee241926396e7..d9fa276ba6f93eff9a5172774219d0da68c7a9d1 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1234,8 +1234,6 @@ tr.turn:hover {
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {
-  padding: $lineheight;
-
   &.error {
     background-color: #ff7070;
   }

diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
index f8eabaeb32a051daaeb9c140b8f0a3b4e95f688f..5dda3ad5c88d717aea4101a5c2a1b701d801713b 100644 (file)
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,5 +1,5 @@
 <% if flash[:error] %>
-  <div class="flash error row align-items-center">
+  <div class="flash error row mx-0 p-3 align-items-center">
     <div class="col-auto">
       <picture>
         <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml" />
@@ -11,7 +11,7 @@
 <% end %>
 
 <% if flash[:warning] %>
-  <div class="flash warning row align-items-center">
+  <div class="flash warning row mx-0 p-3 align-items-center">
     <div class="col-auto">
       <picture>
         <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>
@@ -23,7 +23,7 @@
 <% end %>
 
 <% if flash[:notice] %>
-  <div class="flash notice row align-items-center">
+  <div class="flash notice row mx-0 p-3 align-items-center">
     <div class="col-auto">
       <picture>
         <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>