From: Tom Hughes <tom@compton.nu>
Date: Fri, 12 Apr 2024 17:06:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4686'
X-Git-Tag: live~1072
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/df77a937587ea00a358f6858d4eb6a68c8254e32?hp=485ac16cfc7e4442cedd945cca33fca54d1f30d2

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index b40c60835..629d26a81 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -812,10 +812,6 @@ tr.turn:hover {
 }
 
 .search_form {
-  #query {
-    z-index: 0;
-  }
-
   .describe_location {
     font-size: 10px;
   }
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index c7939aa01..5d612dd78 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -3,7 +3,7 @@
     <div class="row gx-2 mx-0">
       <div class="col">
         <div class="input-group flex-nowrap">
-          <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
+          <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control form-control-sm z-0", :dir => "auto" %>
           <div class="input-group-text border-start-0 p-0 position-relative">
             <%= button_tag t("site.search.where_am_i"), :type => "button", :class => "describe_location position-absolute end-0 me-1 btn btn-sm btn-outline-primary border-0 bg-transparent", :title => t("site.search.where_am_i_title") %>
           </div>
diff --git a/app/views/site/_about_section.html.erb b/app/views/site/_about_section.html.erb
index 60fd3f069..4baec7238 100644
--- a/app/views/site/_about_section.html.erb
+++ b/app/views/site/_about_section.html.erb
@@ -1,4 +1,4 @@
-<%= tag.div :class => "section", :id => local_assigns[:id] do %>
+<%= tag.section :id => local_assigns[:id] do %>
   <div class='d-flex align-items-center gap-2 mb-2'>
     <div class='flex-shrink-0 icon <%= icon %>'></div>
     <h2 class='flex-grow-1 mb-0'><%= t "site.about.#{title}_title" %></h2>
diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index c17f090af..f014eb037 100644
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -140,6 +140,14 @@
         <%= t ".legal_babble.contributors_fr_credit_html",
               :france => tag.strong(t(".legal_babble.contributors_fr_france")) %>
       </li>
+      <li>
+        <%= t ".legal_babble.contributors_hr_credit_html",
+              :croatia => tag.strong(t(".legal_babble.contributors_hr_croatia")),
+              :dgu_link => link_to(t(".legal_babble.contributors_hr_dgu"),
+                                   t(".legal_babble.contributors_hr_dgu_url")),
+              :open_data_portal => link_to(t(".legal_babble.contributors_hr_open_data_portal"),
+                                           t(".legal_babble.contributors_hr_open_data_portal_url")) %>
+      </li>
       <li>
         <%= t ".legal_babble.contributors_nl_credit_html",
               :netherlands => tag.strong(t(".legal_babble.contributors_nl_netherlands")),
diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 9b9499e65..7f97f9c64 100644
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -6,7 +6,7 @@
   <%= hidden_field_tag "format", "osm", :autocomplete => "off" %>
 
   <div class='export_area_inputs'>
-    <div class='export_boxy border border-secondary-subtle rounded bg-body-secondary'>
+    <div class='export_boxy border border-secondary-subtle rounded bg-body-secondary' dir='ltr'>
       <%= text_field_tag("maxlat", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control mx-auto") %>
       <div class="clearfix">
         <%= text_field_tag("minlon", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control my-2") %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f9117ca1c..77002268b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2098,6 +2098,14 @@ en:
           %{france}: Contains data sourced from
           Direction Générale des Impôts.
         contributors_fr_france: France
+        contributors_hr_credit_html: |
+          %{croatia}: Contains data from the %{dgu_link} and %{open_data_portal}
+          (public information of Croatia).
+        contributors_hr_croatia: Croatia
+        contributors_hr_dgu: State Geodetic Administration of Croatia
+        contributors_hr_dgu_url: https://dgu.gov.hr/
+        contributors_hr_open_data_portal: National Open Data Portal
+        contributors_hr_open_data_portal_url: https://data.gov.hr/
         contributors_nl_credit_html: |
           %{netherlands}: Contains &copy; AND data, 2007 (%{and_link})
         contributors_nl_netherlands: Netherlands