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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 71649fbce4f6386c7952cd9fa4997c07056b7efd..9aefd3d695978e929ac7517497c26a13f6bbb3ba 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -924,11 +924,6 @@ div.secondary-actions {
   .sprite.rules {
     /*rtl:ignore*/ background-position: -350px 0;
   }
-
-  .icon.note {
-    background-color: #333;
-    border-radius: 4px;
-  }
 }
 
 .site-about #content {

diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb
index c1a61362fdaa36ce61cb41610acc56b9e02b9a16..3edafd8b7fc8ac99ff0b5bec2d768056a8e7c3b7 100644 (file)
--- a/app/views/site/fixthemap.html.erb
+++ b/app/views/site/fixthemap.html.erb
@@ -22,7 +22,7 @@
   <div class='col-sm'>
     <h5><%= t "site.welcome.add_a_note.title" %></h5>
     <p><%= t "site.welcome.add_a_note.para_1" %></p>
-    <p><%= t ".how_to_help.add_a_note.instructions_1_html", :note_icon => tag.a(:class => "icon note") %></p>
+    <p><%= t ".how_to_help.add_a_note.instructions_1_html", :note_icon => tag.a(:class => "icon note bg-dark rounded-1") %></p>
   </div>
 </div>
 

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index 8ec32ea9c86e8446f870b9f3506ccec2158cf17a..f8f339284f222246ee303fae979dcdee80fc1689 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -73,5 +73,5 @@
   <h2><%= t ".add_a_note.title" %></h2>
   <p><%= t ".add_a_note.para_1" %></p>
   <p><%= t ".add_a_note.para_2_html", :map_link => link_to(t(".add_a_note.the_map"), root_path),
-                                      :note_icon => tag.span(:class => "icon note") %></p>
+                                      :note_icon => tag.span(:class => "icon note bg-dark rounded-1") %></p>
 </div>