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

diff --git a/Gemfile.lock b/Gemfile.lock
index 00bf5384b81e9fa09bc127cac1e478f5d521e2eb..f3e39e829b05a57e1749b4075761c3ee43f0e535 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.909.0)
+    aws-partitions (1.910.0)
     aws-sdk-core (3.191.6)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
@@ -475,7 +475,7 @@ GEM
     rdoc (6.6.3.1)
       psych (>= 4.0.0)
     regexp_parser (2.9.0)
-    reline (0.5.0)
+    reline (0.5.1)
       io-console (~> 0.5)
     request_store (1.6.0)
       rack (>= 1.4)
@@ -485,7 +485,7 @@ GEM
     rouge (4.2.1)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
-    rubocop (1.62.1)
+    rubocop (1.63.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index a04615a89d1dc2200e2dea9ad7232e445324bc06..ed79a7cec0d06ffb968d83887294508bc90e6b5a 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -377,7 +377,6 @@ body.small-nav {
     float: right;
     width: 250px;
     height: 100%;
-    background: white;
     overflow: auto;
 
     .section {
@@ -429,7 +428,7 @@ body.small-nav {
     li  {
       overflow: hidden;
       border-radius: 3px;
-      border: 2px solid #fff;
+      border: 2px solid transparent;
       margin-bottom: 8px;
       position: relative;
       transition: border-color 0.08s ease-in;
@@ -443,8 +442,8 @@ body.small-nav {
         cursor: pointer;
         font-weight: 600;
         font-size: 16px;
-        text-stroke: 2px #fff;
-        background: rgba(255,255,255,.9);
+        background-color: var(--bs-body-bg);
+        opacity: 0.9;
         z-index: 1000;
         input[type="radio"] {
           display: none;
@@ -686,8 +685,6 @@ tr.turn:hover {
   }
 
   .export_boxy {
-    background: $lightgrey;
-
     > * {
         margin: -1px;
     }

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 3bc62883f8427751890fa9535d2f9d81610caf9c..9b9499e6586f4f117a7bc760a49741f3c0640bdf 100644 (file)
--- 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'>
+    <div class='export_boxy border border-secondary-subtle rounded bg-body-secondary'>
       <%= 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") %>