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

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 3d6ab94bfda3f73fd956b358502b204c0366426d..7df0cdc5258882e176be998f6a3e00a01889e281 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -487,16 +487,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 {
@@ -578,10 +568,6 @@ tr.turn {
 
 .routing_marker { width: 15px; cursor: move; }
 
-.browse_status {
-  display: none;
-}
-
 /* Rules for the history sidebar */
 
 #sidebar .changesets {
@@ -635,16 +621,6 @@ tr.turn {
   }
 }
 
-/* Bootstrap buttons don't have any vertical margin, so
-   they touch when adjacent buttons wrap onto a new line
-   e.g. wide form buttons on a narrow sidebar */
-
-.btn-wrapper {
-  > .btn {
-    margin-bottom: $spacer * 0.25;
-  }
-}
-
 /* Force LTR/RTL alignment for placeholder text */
 
 .form-control::placeholder {

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
 

diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
index dc649cbf491fb9a2925f1fd0303a26ff0234b8fa..f15bc195c584d7614bfe1548f08fa4a63d24d860 100644 (file)
--- a/app/views/accounts/edit.html.erb
+++ b/app/views/accounts/edit.html.erb
@@ -54,11 +54,11 @@
     </span>
   </div>
 
-  <div class="row justify-content-between">
-    <div class="col-auto btn-wrapper">
+  <div class="row justify-content-between g-1">
+    <div class="col-auto">
       <%= f.primary t(".save changes button") %>
     </div>
-    <div class="col-auto btn-wrapper">
+    <div class="col-auto">
       <%= link_to t(".delete_account"), account_deletion_path, :class => "btn btn-outline-danger" %>
     </div>
   </div>

diff --git a/app/views/notes/new.html.erb b/app/views/notes/new.html.erb
index 6728b32ffbc6a501abb252fc6941b3ec3e2cfdcd..c9b1275b9493f43c9bca1525341dd9b6910af7d2 100644 (file)
--- a/app/views/notes/new.html.erb
+++ b/app/views/notes/new.html.erb
@@ -15,7 +15,7 @@
     <div class="mb-3">
       <textarea class="form-control" name="text" cols="40" rows="10" maxlength="2000" placeholder="<%= t(".advice") %>"></textarea>
     </div>
-    <div class="btn-wrapper">
+    <div>
       <input type="submit" name="add" value="<%= t(".add") %>" disabled="1" class="btn btn-primary">
     </div>
   </form>

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index b3f1244338dc6ab4b704304caf73036715786194..a04cbf9d9b215dee8fa5da9578bc27a0ef398c6c 100644 (file)
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -51,7 +51,7 @@
         </div>
         <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
         </div>
-        <div class="btn-wrapper">
+        <div class="d-flex flex-wrap gap-1">
           <% if current_user.moderator? -%>
             <%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-light",
                                        :data => { :method => "DELETE",
@@ -77,7 +77,7 @@
       <input type="hidden" name="text" value="" autocomplete="off">
       <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
       </div>
-      <div class="btn-wrapper">
+      <div class="d-flex flex-wrap gap-1">
         <% if @note.status != "hidden" and current_user and current_user.moderator? -%>
           <input type="submit" name="hide" value="<%= t(".hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
         <% end -%>