From: Tom Hughes Date: Sun, 19 May 2024 17:58:46 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4812' X-Git-Tag: live~709 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/eb8ca534ad86333c12c5cd9991a8acc99c5ec08f?hp=77fd890b7946519b3deefbd5a19fa2ed5563e8fd Merge remote-tracking branch 'upstream/pull/4812' --- diff --git a/Gemfile.lock b/Gemfile.lock index 95bebd649..4081a0cda 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -481,7 +481,8 @@ GEM io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rinku (2.0.6) rotp (6.3.0) rouge (4.2.1) @@ -560,6 +561,7 @@ GEM stringio (3.1.0) strong_migrations (1.8.0) activerecord (>= 5.2) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) terser (1.2.2) diff --git a/app/assets/images/welcome-sprite.svg b/app/assets/images/welcome-sprite.svg index 5381a2542..3ea9b354e 100644 --- a/app/assets/images/welcome-sprite.svg +++ b/app/assets/images/welcome-sprite.svg @@ -10,11 +10,11 @@ - - + - - + + + diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c7b733f26..aa8b9d65b 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -891,29 +891,20 @@ div.secondary-actions { } } -/* Rules for the "Welcome" page */ +/* Rules for the "Welcome" and "Fix the map" pages */ + .site-welcome, .site-fixthemap { .sprite { - background-image: image-url("welcome-sprite.svg"); - background-size: 500px 250px; - display: block; - } - - .sprite.small { width: 50px; height: 50px; + background-image: image-url("welcome-sprite.svg"); + background-size: 500px 250px; } .sprite.x { /*rtl:ignore*/ background-position: -50px 0; } - .sprite.term { - margin-right: 10px; - vertical-align: middle; - display: inline-block; - } - .sprite.node { /*rtl:ignore*/ background-position: -100px 0; } @@ -939,6 +930,8 @@ div.secondary-actions { } } +/* Rules for the "About" page */ + .site-about #content { .content-inner { max-width: 760px; diff --git a/app/views/site/_any_questions.html.erb b/app/views/site/_any_questions.html.erb index 5098a1eee..3458999a6 100644 --- a/app/views/site/_any_questions.html.erb +++ b/app/views/site/_any_questions.html.erb @@ -1,6 +1,6 @@ -

<%= t ".title" %>

-
- +

<%= 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/fixthemap.html.erb b/app/views/site/fixthemap.html.erb index 3edafd8b7..1e943c7cc 100644 --- a/app/views/site/fixthemap.html.erb +++ b/app/views/site/fixthemap.html.erb @@ -13,14 +13,14 @@
-
<%= t ".how_to_help.join_the_community.title" %>
+

<%= t ".how_to_help.join_the_community.title" %>

<%= t ".how_to_help.join_the_community.explanation_html" %>

<%= t("layouts.start_mapping") %>

-
<%= t "site.welcome.add_a_note.title" %>
+

<%= 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 bg-dark rounded-1") %>

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index 3f16e0845..22783ce2d 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -12,15 +12,11 @@
-
- -
+

<%= t ".whats_on_the_map.on_the_map_html", :real_and_current => tag.em(t(".whats_on_the_map.real_and_current")) %>

-
- -
+

<%= t ".whats_on_the_map.off_the_map_html", :doesnt => tag.em(t(".whats_on_the_map.doesnt")) %>

@@ -29,44 +25,40 @@

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

-
-
- +
    +
  • + <%= 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_way_html", :way => tag.strong(t(".basic_terms.way")) %> -
    • -
    - + +
  • + <%= t ".basic_terms.a_tag_html", :tag => tag.strong(t(".basic_terms.tag")) %> -
    • -
    + + -
    -

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

    - +

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

    +
    +

    <%= t ".rules.para_1_html", :imports_link => link_to(t(".rules.imports"), t(".rules.imports_url")), :automated_edits_link => link_to(t(".rules.automated_edits"), t(".rules.automated_edits_url")) %>

    -
    - <%= render "any_questions" %> -
    +<%= render "any_questions" %> -
    -

    +

    <% if params[:oauth_return_url] %> <%= t ".continue_authorization" %> <% else %> - <%= t ".start_mapping" %> + <%= t ".start_mapping" %> <% end %> -

    diff --git a/yarn.lock b/yarn.lock index 0c3bd5c63..f67c71cea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,10 +19,10 @@ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8" integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw== -"@eslint/eslintrc@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.0.2.tgz#36180f8e85bf34d2fe3ccc2261e8e204a411ab4e" - integrity sha512-wV19ZEGEMAC1eHgrS7UQPqsdEiCIbTKTasEfcXAigzoXICcqZSjBZEHlZwNVvKg6UBCjSlos84XiLqsRJnIcIg== +"@eslint/eslintrc@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6" + integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -34,10 +34,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.2.0.tgz#b0a9123e8e91a3d9a2eed3a04a6ed44fdab639aa" - integrity sha512-ESiIudvhoYni+MdsI8oD7skpprZ89qKocwRM2KEvhhBJ9nl5MRh7BXU5GTod7Mdygq+AUl+QzId6iWJKR/wABA== +"@eslint/js@9.3.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.3.0.tgz#2e8f65c9c55227abc4845b1513c69c32c679d8fe" + integrity sha512-niBqk8iwv96+yuTwjM6bWg8ovzAPF9qkICsGtcoa5/dmqcEMfdwNAX7+/OHcJHc7wj7XqPxH98oAHytFYlw6Sw== "@humanwhocodes/config-array@^0.13.0": version "0.13.0" @@ -58,10 +58,10 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3" integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA== -"@humanwhocodes/retry@^0.2.3": - version "0.2.3" - resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.2.3.tgz#c9aa036d1afa643f1250e83150f39efb3a15a631" - integrity sha512-X38nUbachlb01YMlvPFojKoiXq+LzZvuSce70KPMPdeM1Rj03k4dR7lDslhbqXn3Ang4EU3+EAmwEAsbrjHW3g== +"@humanwhocodes/retry@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570" + integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -246,17 +246,17 @@ eslint-visitor-keys@^4.0.0: integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw== eslint@^9.0.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.2.0.tgz#0700ebc99528753315d78090876911d3cdbf19fe" - integrity sha512-0n/I88vZpCOzO+PQpt0lbsqmn9AsnsJAQseIqhZFI8ibQT0U1AkEKRxA3EVMos0BoHSXDQvCXY25TUjB5tr8Og== + version "9.3.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.3.0.tgz#36a96db84592618d6ed9074d677e92f4e58c08b9" + integrity sha512-5Iv4CsZW030lpUqHBapdPo3MJetAPtejVW8B84GIcIIv8+ohFaddXsrn1Gn8uD9ijDb+kcYKFUVmC8qG8B2ORQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" - "@eslint/eslintrc" "^3.0.2" - "@eslint/js" "9.2.0" + "@eslint/eslintrc" "^3.1.0" + "@eslint/js" "9.3.0" "@humanwhocodes/config-array" "^0.13.0" "@humanwhocodes/module-importer" "^1.0.1" - "@humanwhocodes/retry" "^0.2.3" + "@humanwhocodes/retry" "^0.3.0" "@nodelib/fs.walk" "^1.2.8" ajv "^6.12.4" chalk "^4.0.0"