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

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 8b5f7f42d222d8f6903e199cbce64b2ddeeb7ddb..ad463c259320daa443ac57d4836a2faf30d4059a 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -45,7 +45,7 @@
     <h3><%= t ".reports_of_this_issue" %></h3>
 
     <% if @read_reports.present? %>
-    <div class="bg-light text-muted">
+    <div class="bg-body-tertiary text-muted">
       <h4><%= t ".read_reports" %></h4>
       <%= render "reports", :reports => @read_reports %>
     </div>

diff --git a/app/views/shared/_richtext_field.html.erb b/app/views/shared/_richtext_field.html.erb
index 22b3db54228fbd1d03e2eb5d43c138acb65dba87..f471cbbbf93bf89457e081abaa67ec5a91c67aa3 100644 (file)
--- a/app/views/shared/_richtext_field.html.erb
+++ b/app/views/shared/_richtext_field.html.erb
@@ -4,7 +4,7 @@
     <div id="<%= id %>_preview" class="richtext_preview richtext text-break"></div>
   </div>
   <div id="<%= id %>_help" class="col-sm-4 richtext_help">
-    <div class="card bg-light h-100">
+    <div class="card bg-body-tertiary h-100">
       <div class="card-body">
         <%= render :partial => "shared/#{type}_help" %>
         <%= submit_tag t(".edit"), :id => "#{id}_doedit", :class => "richtext_doedit btn btn-primary", :disabled => true %>

diff --git a/package.json b/package.json
index 924bf17a73453659f7aa50d0538553e1b711202d..0a9ebf0b66e4b06678d5ea2709b21ec59581f99a 100644 (file)
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "jquery-simulate": "^1.0.2",
     "js-cookie": "^3.0.0",
     "leaflet": "^1.8.0",
-    "leaflet.locatecontrol": "^0.79.0",
+    "leaflet.locatecontrol": "^0.81.0",
     "osm-community-index": "^5.2.0",
     "qs": "^6.9.4"
   },

diff --git a/yarn.lock b/yarn.lock
index ffb223b4ccb6342ba15b50dc300b1d6a5354281d..1493b7305e384f96ea71d895c6bbb2f0ba736c10 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -516,10 +516,10 @@ keyv@^4.5.4:
   dependencies:
     json-buffer "3.0.1"
 
-leaflet.locatecontrol@^0.79.0:
-  version "0.79.0"
-  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.79.0.tgz#0236b87c699a49f9ddb2f289941fbc0d3c3f8b62"
-  integrity sha512-h64QIHFkypYdr90lkSfjKvPvvk8/b8UnP3m9WuoWdp5p2AaCWC0T1NVwyuj4rd5U4fBW3tQt4ppmZ2LceHMIDg==
+leaflet.locatecontrol@^0.81.0:
+  version "0.81.0"
+  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.81.0.tgz#75e92d07c19edade910a2b5a177ac24cef7d10e7"
+  integrity sha512-5Dqj6VXVFl1vPquYZW95hQYegvzqSI4eLIpZrBMuHuyoAo5i9y6js3z02TF//XXZByIyTI/XBtlxlZLUM08Pcg==
 
 leaflet@^1.8.0:
   version "1.9.4"