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

diff --git a/Gemfile.lock b/Gemfile.lock
index 95bebd649f74e25a1067520709312c7bd627f037..4081a0cda729ca2ab3cb771e339fc07a93313f68 100644 (file)
--- 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 5381a25420128b53c581c6b18672bab0d11acd07..3ea9b354efe9a25eff062395b4c1d706f01405d3 100644 (file)
--- a/app/assets/images/welcome-sprite.svg
+++ b/app/assets/images/welcome-sprite.svg
@@ -10,11 +10,11 @@
       <path d="M519.728 582.914l19.834-15.219L580 617.362l-19.834 15.219z" opacity=".5"/>
       <path d="M510.597 571.013l19.834-15.219 6.088 7.934-19.834 15.219zm52.613 65.535l19.834-15.219 1.198 17.988-3.967 3.044z"/>
     </g>
-    <use xlink:href="#B" x="600" fill="#fff"/>
-    <path d="M425 639.362l-20-20v-29l20-20h68l2 2v65l-2 2zm-45.698-82a15.7 15.7 0 0 0-15.698 15.698c0 1.581.284 3.074.719 4.513l-39.113 39.113c-1.44-.435-2.932-.719-4.513-.719A15.7 15.7 0 0 0 305 631.665a15.7 15.7 0 0 0 15.698 15.698 15.7 15.7 0 0 0 15.698-15.698c0-1.581-.284-3.074-.719-4.513l39.113-39.113c1.44.435 2.932.719 4.513.719A15.7 15.7 0 0 0 395 573.06a15.7 15.7 0 0 0-15.698-15.698zm0 9.419a6.28 6.28 0 0 1 6.279 6.279 6.28 6.28 0 0 1-6.279 6.279 6.28 6.28 0 0 1-6.279-6.279 6.28 6.28 0 0 1 6.279-6.279zm-58.605 58.605a6.28 6.28 0 0 1 6.279 6.279 6.28 6.28 0 0 1-6.279 6.279 6.28 6.28 0 0 1-6.279-6.279 6.28 6.28 0 0 1 6.279-6.279zM250 557.362c-20.71 0-37.5 16.789-37.5 37.5s37.5 52.5 37.5 52.5 37.5-31.789 37.5-52.5-16.789-37.5-37.5-37.5zm1.172 22.5c8.285 0 15 6.716 15 15s-6.716 15-15 15-15-6.716-15-15 6.716-15 15-15z" fill="#7092ff"/>
+    <path d="M425 639.362l-20-20v-29l20-20h68l2 2v65l-2 2zm-45.698-82a15.7 15.7 0 0 0-15.698 15.698c0 1.581.284 3.074.719 4.513l-39.113 39.113c-1.44-.435-2.932-.719-4.513-.719A15.7 15.7 0 0 0 305 631.665a15.7 15.7 0 0 0 15.698 15.698 15.7 15.7 0 0 0 15.698-15.698c0-1.581-.284-3.074-.719-4.513l39.113-39.113c1.44.435 2.932.719 4.513.719A15.7 15.7 0 0 0 395 573.06a15.7 15.7 0 0 0-15.698-15.698zM250 557.362c-20.71 0-37.5 16.789-37.5 37.5s37.5 52.5 37.5 52.5 37.5-31.789 37.5-52.5-16.789-37.5-37.5-37.5z" fill="#7092ff"/>
     <path d="M31 598.362h-2l-3 3v2l14 14 5 5 5-5 25-25v-2l-3-3h-2l-25 25z" fill="#fff"/>
-    <path d="M337 631.362c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16z" fill="#7092ff"/>
-    <path d="M328 631.362a7 7 0 1 1-14 0 7 7 0 1 1 14 0z" fill="#fff"/>
+    <circle cx="251.172" cy="594.862" r="15" fill="#fff"/>
+    <circle cx="321" cy="631.362" r="7" fill="#fff"/>
+    <circle cx="380" cy="573.362" r="7" fill="#fff"/>
     <use xlink:href="#B" x="600" fill="#7092ff"/>
     <g fill="#fff">
       <path d="M644.42 607.312q0-3 1.26-5.04 1.26-2.04 4.32-4.26 2.7-1.92 3.84-3.3 1.2-1.44 1.2-3.36 0-1.92-1.44-2.88-1.38-1.02-3.9-1.02-2.52 0-4.98.78-2.46.78-5.04 2.1l-3.18-6.42q2.94-1.62 6.36-2.64 3.42-1.02 7.5-1.02 6.24 0 9.66 3 3.48 3 3.48 7.62 0 2.46-.78 4.26-.78 1.8-2.34 3.36-1.56 1.5-3.9 3.24-1.74 1.26-2.7 2.16-.96.9-1.32 1.74-.3.84-.3 2.1v1.74h-7.74zm-.96 12.18q0-2.76 1.5-3.84 1.5-1.14 3.66-1.14 2.1 0 3.6 1.14 1.5 1.08 1.5 3.84 0 2.64-1.5 3.84-1.5 1.14-3.6 1.14-2.16 0-3.66-1.14-1.5-1.2-1.5-3.84z"/>

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c7b733f2605616d583dc0d98c77081e1a012a246..aa8b9d65b64c62931c2a372fd91c0ab06d11851c 100644 (file)
--- 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 5098a1eee75790c98307037aefcbf1441c650599..3458999a6dc83902d6e75095251b780c263a4622 100644 (file)
--- a/app/views/site/_any_questions.html.erb
+++ b/app/views/site/_any_questions.html.erb
@@ -1,6 +1,6 @@
-  <h2><%= t ".title" %></h2>
-  <div class='clearfix'>
-  <span class='sprite small term question float-start'></span>
+<h2><%= t ".title" %></h2>
+<div class='d-flex align-items-center gap-2'>
+  <span class='flex-shrink-0 align-self-start sprite question'></span>
   <p><%= 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")) %></p>
-  </div>
+</div>

diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb
index 3edafd8b7fc8ac99ff0b5bec2d768056a8e7c3b7..1e943c7cc8dc8eccffa8856a10cdb387cac7b1a4 100644 (file)
--- a/app/views/site/fixthemap.html.erb
+++ b/app/views/site/fixthemap.html.erb
@@ -13,14 +13,14 @@
 
 <div class='row'>
   <div class='col-sm'>
-    <h5><%= t ".how_to_help.join_the_community.title" %></h5>
+    <h3 class='fs-5'><%= t ".how_to_help.join_the_community.title" %></h3>
     <p><%= t ".how_to_help.join_the_community.explanation_html" %></p>
     <p class='text-center'>
       <a class="btn btn-primary" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>
     </p>
   </div>
   <div class='col-sm'>
-    <h5><%= t "site.welcome.add_a_note.title" %></h5>
+    <h3 class='fs-5'><%= t "site.welcome.add_a_note.title" %></h3>
     <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 bg-dark rounded-1") %></p>
   </div>

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index 3f16e08454947e97ab437db2a1b77994f0d890fb..22783ce2d19de49fbbe44a8d2ca6f4a143b3045a 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -12,15 +12,11 @@
 
 <div class='row'>
   <div class='col-sm'>
-    <div>
-      <span class='sprite small check mx-auto'></span>
-    </div>
+    <span class='d-block mx-auto sprite check'></span>
     <p><%= t ".whats_on_the_map.on_the_map_html", :real_and_current => tag.em(t(".whats_on_the_map.real_and_current")) %></p>
   </div>
   <div class='col-sm'>
-    <div>
-      <span class='sprite small x mx-auto'></span>
-    </div>
+    <span class='d-block mx-auto sprite x'></span>
     <p><%= t ".whats_on_the_map.off_the_map_html", :doesnt => tag.em(t(".whats_on_the_map.doesnt")) %></p>
   </div>
 </div>
@@ -29,44 +25,40 @@
 
 <p><%= t ".basic_terms.paragraph_1" %></p>
 
-<div>
-  <div class='align-middle mb-2'>
-    <span class='sprite small term editor'></span>
+<ul class='list-unstyled'>
+  <li class='d-flex align-items-center gap-2 mb-2'>
+    <span class='flex-shrink-0 align-self-start sprite editor'></span>
     <span><%= t ".basic_terms.an_editor_html", :editor => tag.strong(t(".basic_terms.editor")) %></span>
-  </div>
-  <div class='align-middle mb-2'>
-    <span class='sprite small term node'></span>
+  </li>
+  <li class='d-flex align-items-center gap-2 mb-2'>
+    <span class='flex-shrink-0 align-self-start sprite node'></span>
     <span><%= t ".basic_terms.a_node_html", :node => tag.strong(t(".basic_terms.node")) %></span>
-  </div>
-  <div class='align-middle mb-2'>
-    <span class='sprite small term way'></span>
+  </li>
+  <li class='d-flex align-items-center gap-2 mb-2'>
+    <span class='flex-shrink-0 align-self-start sprite way'></span>
     <span><%= t ".basic_terms.a_way_html", :way => tag.strong(t(".basic_terms.way")) %></span>
-  </div>
-  <div class='align-middle mb-2'>
-    <span class='sprite small term tag'></span>
+  </li>
+  <li class='d-flex align-items-center gap-2 mb-2'>
+    <span class='flex-shrink-0 align-self-start sprite tag'></span>
     <span><%= t ".basic_terms.a_tag_html", :tag => tag.strong(t(".basic_terms.tag")) %></span>
-  </div>
-</div>
+  </li>
+</ul>
 
-<div class='clearfix'>
-  <h2><%= t ".rules.title" %></h2>
-  <span class='sprite small term rules float-start'></span>
+<h2><%= t ".rules.title" %></h2>
+<div class='d-flex align-items-center gap-2'>
+  <span class='flex-shrink-0 align-self-start sprite rules'></span>
   <p><%= 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")) %></p>
 </div>
 
-<div class='clearfix'>
-  <%= render "any_questions" %>
-</div>
+<%= render "any_questions" %>
 
-<div class='clearfix text-center'>
-  <p class="display-5">
+<div class='text-center mb-3'>
 <% if params[:oauth_return_url] %>
   <a class="btn btn-primary" href="<%= params[:oauth_return_url] %>"><%= t ".continue_authorization" %></a>
 <% else %>
-  <a class="button btn btn-primary start-mapping" href="<%= edit_path %>"><%= t ".start_mapping" %></a>
+  <a class="btn btn-primary start-mapping" href="<%= edit_path %>"><%= t ".start_mapping" %></a>
 <% end %>
-  </p>
 </div>
 
 <div class='alert alert-primary'>

diff --git a/yarn.lock b/yarn.lock
index 0c3bd5c63097296c8e592e6c7262a55f3b98d8a6..f67c71cea6c3de5f59c024ef1af070738b1e1db4 100644 (file)
--- 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"