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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 100d489da88424773492079b4185c18fc9ffc06c..3edeeb4d8fcfbc6edcd6b01cd3e9409080c3355e 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -405,10 +405,6 @@ body.small-nav {
     #sidebar_content {
       padding: $spacer;
     }
-
-    > div {
-      position: relative;
-    }
   }
 
   .overlay-sidebar #sidebar {
@@ -432,11 +428,6 @@ body.small-nav {
 
   .welcome {
     display: none;
-
-    p {
-      font-size: 110%;
-      font-weight: 300;
-    }
   }
 
   #banner {
@@ -852,11 +843,6 @@ tr.turn:hover {
     bottom: 0;
     width: 100%;
   }
-
-  #map {
-    height: 100%;
-    overflow: hidden;
-  }
 }
 
 /* Rules for non-map content pages */
@@ -1093,13 +1079,6 @@ div.secondary-actions {
   }
 }
 
-/* Rules for the iD editor */
-
-.id-embed {
-  width: 100%;
-  height: 100%;
-}
-
 /* Rules for the "Welcome" page */
 .site-welcome, .site-fixthemap {
   .sprite {

diff --git a/app/views/layouts/_banner.html.erb b/app/views/layouts/_banner.html.erb
index f6b866ff91e1267287c483bdd9e6aaa68fd8ec65..344c5ed711fb316e7e8e647fbe73db888beb3d84 100644 (file)
--- a/app/views/layouts/_banner.html.erb
+++ b/app/views/layouts/_banner.html.erb
@@ -1,5 +1,5 @@
 <% unless (banner = next_banner()).nil? %>
-  <%= tag.div :id => "banner", :data => { :bs_theme => token_list(:dark => banner[:dark]) } do %>
+  <%= tag.div :id => "banner", :class => "position-relative", :data => { :bs_theme => token_list(:dark => banner[:dark]) } do %>
     <%= link_to (image_tag banner[:img], :srcset => banner[:srcset], :alt => banner[:alt], :title => banner[:alt]), banner[:link] %>
     <button type="button"
             class="btn-close position-absolute top-0 end-0 m-4 opacity-100 bg-white bg-opacity-50"

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index a3d303c53fdc5129968c55a928bda72a32a2ae4f..646c22dea4fca3258f5600634d5cb6178415a622 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -43,21 +43,19 @@
     <% unless current_user %>
       <div class="welcome p-3" hidden>
         <%= render "sidebar_header", :title => t("layouts.intro_header") %>
-        <div>
-          <p><%= t "layouts.intro_text" %></p>
-          <p><%= t "layouts.hosting_partners_html",
-                   :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
-                   :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
-                   :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
-                   :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
-          </p>
-          <div class="d-flex mx-n1">
-            <div class="w-50 px-1">
-              <a class="btn btn-primary w-100" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>
-            </div>
-            <div class="w-50 px-1">
-              <a class="btn btn-primary w-100" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>
-            </div>
+        <p class="fs-6 fw-light"><%= t "layouts.intro_text" %></p>
+        <p class="fs-6 fw-light"><%= t "layouts.hosting_partners_html",
+                                       :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
+                                       :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
+                                       :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
+                                       :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
+        </p>
+        <div class="d-flex mx-n1">
+          <div class="w-50 px-1">
+            <a class="btn btn-primary w-100" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>
+          </div>
+          <div class="w-50 px-1">
+            <a class="btn btn-primary w-100" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>
           </div>
         </div>
       </div>

diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index c0ea3631b35a11d7b99068f33c69a23c170622f9..0ba4200a8462ca86a245b57d26a9a6ecc8ebce56 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,10 +1,10 @@
 <%= javascript_include_tag "edit/id" %>
 
-<div id="map">
+<div id="map" class="h-100 overflow-hidden">
   <% data = { :configured => Settings.key?(:id_application) }
      data[:lat] = @lat if @lat
      data[:lon] = @lon if @lon
      data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx]
      data[:url] = id_url(:locale => params[:locale]) %>
-  <%= tag.iframe "", :frameBorder => 0, :id => "id-embed", :class => "id-embed", :allowfullscreen => "", :data => data %>
+  <%= tag.iframe "", :frameBorder => 0, :id => "id-embed", :class => "w-100 h-100", :allowfullscreen => "", :data => data %>
 </div>

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index cbfb12d700ea0d802a5402cb64896720b95c05aa..755636e1de7c507158007e8d71863749e92cfe17 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -73,8 +73,8 @@ diq:
       report: Rapor kerê
       session: Ronıştış
       trace: Şop
-      tracepoint: Dawtey şopi
-      tracetag: Etikete şopi
+      tracepoint: Nuqtaya rêçe
+      tracetag: Etiketê rêçe
       user: Karber
       user_preference: Tercihê Karberi
       user_token: Moriya Karberi

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 2c0d6726e3535855f6b7837c9fce80194594cdc3..967969d34bd3e9c566afcc1c137fe997a51cb95e 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -191,7 +191,7 @@ sr:
       none: Ниједан
       openid: OpenID
       google: Google
-      facebook: Facebook
+      facebook: Фејсбук
       github: GitHub
       wikipedia: Википедија
   api: