From: Tom Hughes Date: Sun, 28 Apr 2024 17:41:17 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4731' X-Git-Tag: live~1007 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0e749fd5bed3a34fd01a7b901f433e6e23e1562d?hp=fa0f31c83c4075bd4fbd3f2538df47ffc5c2defc Merge remote-tracking branch 'upstream/pull/4731' --- diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 71649fbce..9aefd3d69 100644 --- 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 c1a61362f..3edafd8b7 100644 --- a/app/views/site/fixthemap.html.erb +++ b/app/views/site/fixthemap.html.erb @@ -22,7 +22,7 @@
<%= t "site.welcome.add_a_note.title" %>

<%= t "site.welcome.add_a_note.para_1" %>

-

<%= t ".how_to_help.add_a_note.instructions_1_html", :note_icon => tag.a(:class => "icon note") %>

+

<%= t ".how_to_help.add_a_note.instructions_1_html", :note_icon => tag.a(:class => "icon note bg-dark rounded-1") %>

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index 8ec32ea9c..f8f339284 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -73,5 +73,5 @@

<%= t ".add_a_note.title" %>

<%= t ".add_a_note.para_1" %>

<%= 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") %>

+ :note_icon => tag.span(:class => "icon note bg-dark rounded-1") %>