cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2024-04-28 18:41:17 +01:00
commit 0e749fd5be
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/common.scss
View file

@ -924,11 +924,6 @@ div.secondary-actions {
.sprite.rules { .sprite.rules {
/*rtl:ignore*/ background-position: -350px 0; /*rtl:ignore*/ background-position: -350px 0;
} }
.icon.note {
background-color: #333;
border-radius: 4px;
}
} }
.site-about #content { .site-about #content {

2
app/views/site/fixthemap.html.erb
View file

@ -22,7 +22,7 @@
<div class='col-sm'> <div class='col-sm'>
<h5><%= t "site.welcome.add_a_note.title" %></h5> <h5><%= t "site.welcome.add_a_note.title" %></h5>
<p><%= t "site.welcome.add_a_note.para_1" %></p> <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>
</div> </div>

2
app/views/site/welcome.html.erb
View file

@ -73,5 +73,5 @@
<h2><%= t ".add_a_note.title" %></h2> <h2><%= t ".add_a_note.title" %></h2>
<p><%= t ".add_a_note.para_1" %></p> <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), <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> </div>