From: Tom Hughes Date: Tue, 14 May 2024 23:33:26 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4798' X-Git-Tag: live~1369 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b0d3ecb3c31e87f294d57d92a404220094e7bbd5?hp=373cf99a5c55826f9b4c56ea369e8078f59b242b Merge remote-tracking branch 'upstream/pull/4798' --- diff --git a/app/assets/images/closed_note_marker.png b/app/assets/images/closed_note_marker.png deleted file mode 100644 index ad2812fbe..000000000 Binary files a/app/assets/images/closed_note_marker.png and /dev/null differ diff --git a/app/assets/images/closed_note_marker.svg b/app/assets/images/closed_note_marker.svg new file mode 100644 index 000000000..d16b5707e --- /dev/null +++ b/app/assets/images/closed_note_marker.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/closed_note_marker@2x.png b/app/assets/images/closed_note_marker@2x.png deleted file mode 100644 index 96a2592e1..000000000 Binary files a/app/assets/images/closed_note_marker@2x.png and /dev/null differ diff --git a/app/assets/images/new_note_marker.png b/app/assets/images/new_note_marker.png deleted file mode 100644 index a41464487..000000000 Binary files a/app/assets/images/new_note_marker.png and /dev/null differ diff --git a/app/assets/images/new_note_marker.svg b/app/assets/images/new_note_marker.svg new file mode 100644 index 000000000..efa538b72 --- /dev/null +++ b/app/assets/images/new_note_marker.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/new_note_marker@2x.png b/app/assets/images/new_note_marker@2x.png deleted file mode 100644 index 756ad6fe5..000000000 Binary files a/app/assets/images/new_note_marker@2x.png and /dev/null differ diff --git a/app/assets/images/open_note_marker.png b/app/assets/images/open_note_marker.png deleted file mode 100644 index 6fe5cb7ac..000000000 Binary files a/app/assets/images/open_note_marker.png and /dev/null differ diff --git a/app/assets/images/open_note_marker.svg b/app/assets/images/open_note_marker.svg new file mode 100644 index 000000000..8dc07b71a --- /dev/null +++ b/app/assets/images/open_note_marker.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/open_note_marker@2x.png b/app/assets/images/open_note_marker@2x.png deleted file mode 100644 index 84df3f725..000000000 Binary files a/app/assets/images/open_note_marker@2x.png and /dev/null differ diff --git a/app/assets/images/routing-sprite.png b/app/assets/images/routing-sprite.png deleted file mode 100644 index 079f4dd7f..000000000 Binary files a/app/assets/images/routing-sprite.png and /dev/null differ diff --git a/app/assets/images/routing-sprite.svg b/app/assets/images/routing-sprite.svg index 15aa57b2d..54014724b 100644 --- a/app/assets/images/routing-sprite.svg +++ b/app/assets/images/routing-sprite.svg @@ -1,573 +1,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/welcome-sprite.png b/app/assets/images/welcome-sprite.png deleted file mode 100644 index 30d93d7e1..000000000 Binary files a/app/assets/images/welcome-sprite.png and /dev/null differ diff --git a/app/assets/images/welcome-sprite.svg b/app/assets/images/welcome-sprite.svg index 4af03a213..5381a2542 100644 --- a/app/assets/images/welcome-sprite.svg +++ b/app/assets/images/welcome-sprite.svg @@ -1,288 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - ? - - - § + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 2e33438db..e429f4479 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -39,9 +39,9 @@ OSM = { MARKER_ICON_2X: <%= image_path("leaflet/dist/images/marker-icon-2x.png").to_json %>, MARKER_SHADOW: <%= image_path("leaflet/dist/images/marker-shadow.png").to_json %>, - NEW_NOTE_MARKER: <%= image_path("new_note_marker.png").to_json %>, - OPEN_NOTE_MARKER: <%= image_path("open_note_marker.png").to_json %>, - CLOSED_NOTE_MARKER: <%= image_path("closed_note_marker.png").to_json %>, + NEW_NOTE_MARKER: <%= image_path("new_note_marker.svg").to_json %>, + OPEN_NOTE_MARKER: <%= image_path("open_note_marker.svg").to_json %>, + CLOSED_NOTE_MARKER: <%= image_path("closed_note_marker.svg").to_json %>, apiUrl: function (object) { var apiType = object.type === "note" ? "notes" : object.type; diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 0a0310af4..c7b733f26 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -566,7 +566,7 @@ header .search_forms, /* Rules for routing */ div.direction { - background-image: image-url('routing-sprite.png'); + background-image: image-url('routing-sprite.svg'); width: 20px; height: 20px; background-repeat: no-repeat; @@ -894,7 +894,7 @@ div.secondary-actions { /* Rules for the "Welcome" page */ .site-welcome, .site-fixthemap { .sprite { - background-image: image-url("welcome-sprite.png"); + background-image: image-url("welcome-sprite.svg"); background-size: 500px 250px; display: block; } @@ -911,6 +911,7 @@ div.secondary-actions { .sprite.term { margin-right: 10px; vertical-align: middle; + display: inline-block; } .sprite.node { diff --git a/app/views/notes/index.html.erb b/app/views/notes/index.html.erb index 8622bbf29..d5efe0d79 100644 --- a/app/views/notes/index.html.erb +++ b/app/views/notes/index.html.erb @@ -27,9 +27,9 @@ class="table-primary"<% end %>> <% if note.closed? %> - <%= image_tag("closed_note_marker.png", :alt => "closed", :size => "25x40") %> + <%= image_tag("closed_note_marker.svg", :alt => "closed", :width => 25, :height => 40) %> <% else %> - <%= image_tag("open_note_marker.png", :alt => "open", :size => "25x40") %> + <%= image_tag("open_note_marker.svg", :alt => "open", :width => 25, :height => 40) %> <% end %> <%= link_to note.id, note %> diff --git a/app/views/site/_any_questions.html.erb b/app/views/site/_any_questions.html.erb index b330d8035..5098a1eee 100644 --- a/app/views/site/_any_questions.html.erb +++ b/app/views/site/_any_questions.html.erb @@ -1,4 +1,6 @@

<%= t ".title" %>

+

<%= t ".paragraph_1_html", :help_link => link_to(t(".get_help_here"), help_path), :welcome_mat_link => link_to(t(".welcome_mat"), t(".welcome_mat_url")) %>

+
diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index f8f339284..eacccf578 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -29,22 +29,22 @@

<%= t ".basic_terms.paragraph_1" %>

-
-
- -

<%= t ".basic_terms.an_editor_html", :editor => tag.strong(t(".basic_terms.editor")) %>

+
+
+ + <%= t ".basic_terms.an_editor_html", :editor => tag.strong(t(".basic_terms.editor")) %>
-
- -

<%= t ".basic_terms.a_node_html", :node => tag.strong(t(".basic_terms.node")) %>

+
+ + <%= t ".basic_terms.a_node_html", :node => tag.strong(t(".basic_terms.node")) %>
-
- -

<%= t ".basic_terms.a_way_html", :way => tag.strong(t(".basic_terms.way")) %>

+
+ + <%= t ".basic_terms.a_way_html", :way => tag.strong(t(".basic_terms.way")) %>
-
- -

<%= t ".basic_terms.a_tag_html", :tag => tag.strong(t(".basic_terms.tag")) %>

+
+ + <%= t ".basic_terms.a_tag_html", :tag => tag.strong(t(".basic_terms.tag")) %>