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

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 69d625ecab5420ca85f83bcb1a2a0895ef5ec44e..7a761b50036dd30d02c1ec2d2fd0ca16f6b660d0 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -58,7 +58,7 @@ OSM.initializeBrowse = function (map) {
               .click(cancel))),
         $("<p class='alert alert-warning'>")
           .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })),
-        $("<input type='submit' class='btn btn-primary'>")
+        $("<input type='submit' class='btn btn-primary d-block mx-auto'>")
           .val(I18n.t("browse.start_rjs.load_data"))
           .click(add)));
   }

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 4df8b4c2db79badb1a8b6eb37b4f41f9f1fb6836..1517195f0e45cfdfeb9d3fde20ad24da36190bd2 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -489,16 +489,6 @@ body.small-nav {
 
 .donate-attr { color: darken($green, 10%) !important; }
 
-/* Rules for the sidebar */
-
-#browse_status {
-  input {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-  }
-}
-
 /* Temporary label size override until we remove site-wide font customisation */
 
 form {
@@ -580,10 +570,6 @@ tr.turn {
 
 .routing_marker { width: 15px; cursor: move; }
 
-.browse_status {
-  display: none;
-}
-
 /* Rules for the history sidebar */
 
 #sidebar .changesets {

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 172be56531df7e444e4c7ed3b94236480378c660..8b742a585c0e8f7519fb1019222cbcf88216e513 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -18,8 +18,7 @@ class SiteController < ApplicationController
 
   content_security_policy(:only => :id) do |policy|
     policy.connect_src("*")
-    policy.img_src("*", :blob)
-    policy.script_src(*policy.script_src, "dev.virtualearth.net", :unsafe_eval)
+    policy.img_src(*policy.img_src, "*", :blob)
     policy.style_src(*policy.style_src, :unsafe_inline)
   end