From: Tom Hughes <tom@compton.nu>
Date: Thu, 25 Nov 2021 17:15:54 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3380'
X-Git-Tag: live~1855
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/4eecd59a5d976f6edf857c059fa28ed931b73121?hp=5dfbf00776d5247a92cb36135d509fa0eb0b2730

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index fe3693267..d9fa276ba 100644
--- 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 f8eabaeb3..5dda3ad5c 100644
--- 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>