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

diff --git a/app/assets/images/browse/byway.20.png b/app/assets/images/browse/byway.20.png
deleted file mode 100644 (file)
index ee682e3..0000000
Binary files a/app/assets/images/browse/byway.20.png and /dev/null differ

diff --git a/app/assets/images/browse/motorway.20.png b/app/assets/images/browse/motorway.20.png
index 4528ad560f5e4adf647776b19ec3bcfb5eec0cb9..cfd3e04182309f22cc9326a8de2eb7fa932d5da4 100644 (file)
Binary files a/app/assets/images/browse/motorway.20.png and b/app/assets/images/browse/motorway.20.png differ

diff --git a/app/assets/images/browse/primary.20.png b/app/assets/images/browse/primary.20.png
index 91204ac6afede772a4af9f7c6963735e02e3122e..6ee4b0a5e003924949efa30d89812d3166268a12 100644 (file)
Binary files a/app/assets/images/browse/primary.20.png and b/app/assets/images/browse/primary.20.png differ

diff --git a/app/assets/images/browse/secondary.20.png b/app/assets/images/browse/secondary.20.png
index 13e0aa6a40fa60e15f1bba4ffdb9071132b7bf4a..b8f2556e3fc697d6fc64454131b0a34db35dc1f4 100644 (file)
Binary files a/app/assets/images/browse/secondary.20.png and b/app/assets/images/browse/secondary.20.png differ

diff --git a/app/assets/images/browse/tertiary.20.png b/app/assets/images/browse/tertiary.20.png
index bccaa7e0e6f00ad2822870d6d30becd79e9f6b2b..b29cdaa77c538166a270055443a763bb86e53618 100644 (file)
Binary files a/app/assets/images/browse/tertiary.20.png and b/app/assets/images/browse/tertiary.20.png differ

diff --git a/app/assets/images/browse/trunk.20.png b/app/assets/images/browse/trunk.20.png
index c753a3189416d1f7a62f698626cf8b5bbb120503..5e3f1e388840a5bb3466a83c04c1021b3e881f3f 100644 (file)
Binary files a/app/assets/images/browse/trunk.20.png and b/app/assets/images/browse/trunk.20.png differ

diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
index fe398bc5abf1d8c883811c6ff5bb78ca91e7de37..7c0fbd2c005136052b41449362a9664fdb6fd99b 100644 (file)
--- a/app/assets/stylesheets/browse.scss
+++ b/app/assets/stylesheets/browse.scss
@@ -138,7 +138,6 @@
   .building::before { content: image-url('browse/building.png'); }
 
   .highway.bridleway::before { content: image-url('browse/bridleway.20.png'); }
-  .highway.byway::before { content: image-url('browse/byway.20.png'); }
   .highway.cycleway::before { content: image-url('browse/cycleway.20.png'); }
   .highway.footway::before { content: image-url('browse/footway.20.png'); }
   .highway.motorway::before { content: image-url('browse/motorway.20.png'); }

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1ecf1318b2ec087c30d9959c326b2faa2d7317f1..fd12d7e6b9882c8fbac395325a771a12ecec1840 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -513,6 +513,12 @@ header .search_forms,
   display: none;
 }
 
+.search_form {
+  .describe_location {
+    font-size: 10px;
+  }
+}
+
 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {
@@ -645,16 +651,9 @@ tr.turn:hover {
 /* Rules for export sidebar */
 
 .export_form {
-  .export_area_inputs,
-  .export_button {
-    text-align: center;
-  }
-
   .export_area_inputs {
-    margin-bottom: $spacer;
     input[type="text"] {
       width: 100px;
-      text-align: center;
     }
   }
 
@@ -802,21 +801,11 @@ tr.turn:hover {
 /* Rules for messages pages */
 
 .messages {
-  .inbox-row {
-    background: $offwhite;
-  }
-
   .inbox-row-unread td {
     background: #CBEEA7;
   }
 }
 
-.search_form {
-  .describe_location {
-    font-size: 10px;
-  }
-}
-
 /* Rules for user images */
 
 img.user_image {
@@ -865,8 +854,7 @@ div.secondary-actions {
 
 /* Rules for rich text */
 
-.richtext,
-.prose {
+.richtext {
   code {
     background: var(--bs-secondary-bg);
     padding: 2px 3px;

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index e6c15a92014f8afc10fd25b7e61a2b202ee39dd7..3d66db5fbe65cb013289a6b61d6d60978794386f 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -2,7 +2,6 @@
 $lineheight: 20px;
 $typeheight: 14px;
 
-$offwhite: #f8f8ff;
 $blue: #7092FF;
 $secondary: #888;
 $lightblue: #B8C5F0;

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 7f97f9c640b7836dd5138cae3d66080277144c5e..d277f344e4530a3a3f6dd467ff35fd5d192daeb3 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -5,14 +5,14 @@
 <%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form" }) do %>
   <%= hidden_field_tag "format", "osm", :autocomplete => "off" %>
 
-  <div class='export_area_inputs'>
+  <div class='export_area_inputs text-center mb-3'>
     <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") %>
+      <%= text_field_tag("maxlat", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center mx-auto") %>
       <div class="clearfix">
-        <%= text_field_tag("minlon", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control my-2") %>
-        <%= text_field_tag("maxlon", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control my-2") %>
+        <%= text_field_tag("minlon", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center my-2") %>
+        <%= text_field_tag("maxlon", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center my-2") %>
       </div>
-      <%= text_field_tag("minlat", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control mx-auto") %>
+      <%= text_field_tag("minlat", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center mx-auto") %>
       </div>
     <a id='drag_box' href="#"><%= t ".manually_select" %></a>
   </div>

diff --git a/yarn.lock b/yarn.lock
index 1493b7305e384f96ea71d895c6bbb2f0ba736c10..487e5554212d2e9d1e58bf814b9d068b382fcf6b 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -629,9 +629,9 @@ punycode@^2.1.0:
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 qs@^6.9.4:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.0.tgz#edd40c3b823995946a8a0b1f208669c7a200db77"
-  integrity sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==
+  version "6.12.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a"
+  integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==
   dependencies:
     side-channel "^1.0.6"