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

diff --cc Gemfile
index 540f616343d91a6eced60d9dc5e7d00dcae80571,9df88f8fa22376279c35f53246a89e57a9194ce3..cfe734b946caf620778c4ced24519b69922e37e8
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -43,7 -43,8 +43,8 @@@ gem "image_optim_rails
  gem "actionpack-page_caching", ">= 1.2.0"
  gem "active_record_union"
  gem "activerecord-import"
 -gem "bootstrap", "~> 4.3.1"
 +gem "bootstrap", "~> 4.5.0"
+ gem "bootstrap_form", "~> 4.0"
  gem "cancancan"
  gem "composite_primary_keys", "~> 12.0.0"
  gem "config"

diff --cc Gemfile.lock
index 379bab30716313d8ab1e81162f18ea5e63135b16,0aa9545a293453a970a838914f7e062f1335920b..3b3ffaf060bc9b19e20a7cc569e543b9159b8482
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -110,7 -110,9 +110,10 @@@ GE
        autoprefixer-rails (>= 9.1.0)
        popper_js (>= 1.14.3, < 2)
        sassc-rails (>= 2.0.0)
+     bootstrap_form (4.5.0)
+       actionpack (>= 5.2)
+       activemodel (>= 5.2)
 +    brakeman (4.9.0)
      browser (4.2.0)
      builder (3.2.4)
      bzip2-ffi (1.0.0)
@@@ -483,8 -485,8 +486,9 @@@ DEPENDENCIE
    bigdecimal (~> 1.1.0)
    binding_of_caller
    bootsnap (>= 1.4.2)
 -  bootstrap (~> 4.3.1)
 +  bootstrap (~> 4.5.0)
+   bootstrap_form (~> 4.0)
 +  brakeman
    browser
    bzip2-ffi
    cancancan

diff --cc app/assets/javascripts/application.js
Simple merge

diff --cc app/assets/javascripts/leaflet.layers.js
index ddcce195daba2d5f7724d2b81ab876d51d6efeeb,102b024607920d03b2457d52d94e43fe4e2c0f3d..f375dc08ffc031adb4721477d00aa4606ecac327
--- 1/app/assets/javascripts/leaflet.layers.js
--- 2/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@@ -116,10 -116,10 +116,10 @@@ L.OSM.layers = function (options) 
  
        $("<p>")
          .text(I18n.t("javascripts.map.layers.overlays"))
 -        .attr("class", "deemphasize")
 +        .attr("class", "text-muted")
          .appendTo(overlaySection);
  
-       var overlays = $("<ul class='list-unstyled'>")
+       var overlays = $("<ul class='list-unstyled standard-form'>")
          .appendTo(overlaySection);
  
        var addOverlay = function (layer, name, maxArea) {

diff --cc app/assets/stylesheets/common.scss
index 50bcf9be7b13124c05e9519154e974abf52db565,6de8fee64f7539af7331e4e5d76e5e1fac8e36b1..95e0c292ac4cc9c7abe91791fa55dc4fe0c2931e
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -1246,41 -1168,14 +1143,17 @@@ tr.turn:hover 
  /* Rules for small maps in content areas */
  
  .content_map {
 -  position: relative;
 -  width: 45%;
 -  height: 400px;
 +  height: 200px;
    border: 1px solid $grey;
    margin-bottom: $lineheight;
 -  float: right;
 +}
 +
 +@include media-breakpoint-up(md) {
 +  .content_map {
 +    height: 400px;
 +  }
  }
  
- /* Rules for the new trace form */
- 
- #new_trace {
-   input[type=text] {
-     width: 50%;
-     width: calc(100% - 150px);
-     max-width: 500px;
-   }
- }
- 
- /* Rules for the edit trace form */
- 
- .edit_trace {
-   .standard-form-row p {
-     margin-bottom: 0px;
-   }
- 
-   input[type=text] {
-     width: 50%;
-     width: calc(100% - 150px);
-     max-width: 500px;
-   }
- }
- 
  /* Rules for the user profile page */
  
  #userinformation {

diff --cc app/views/browse/changeset.html.erb
Simple merge

diff --cc app/views/browse/new_note.html.erb
index 51633ffca5b6a24e183d6ea7b65fb83f1396d11a,fbc2da3cd7d06fa27e9cbe4883fa4d392d52c358..4e4f571cc2b8ea3441d0cc5ab5c1171884d36904
--- 1/app/views/browse/new_note.html.erb
--- 2/app/views/browse/new_note.html.erb
+++ b/app/views/browse/new_note.html.erb
@@@ -6,8 -6,8 +6,8 @@@
  </h2>
  
  <div class="note browse-section">
 -  <p class="warning"><%= t("javascripts.notes.new.intro") %></p>
 +  <p class="alert alert-info"><%= t("javascripts.notes.new.intro") %></p>
-   <form action="#">
+   <form action="#" class="standard-form">
      <input type="hidden" name="lon">
      <input type="hidden" name="lat">
      <textarea class="comment" name="text" cols="40" rows="10" maxlength="2000" placeholder="<%= t("javascripts.notes.new.advice") %>"></textarea>

diff --cc app/views/browse/note.html.erb
Simple merge

diff --cc app/views/site/export.html.erb
Simple merge

diff --cc app/views/users/confirm.html.erb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc package.json
index 82bc5ead5d176bad74adc27f6708b06e1f9dd803,5757fdb220a4a4cbb32d4ef52055bdaf89a3875e..b1bf411d9926ccf229830c11a2c7082d0ac8a4cb
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -1,8 -1,10 +1,10 @@@
  {
    "name": "openstreetmap",
    "private": true,
-   "dependencies": {},
+   "dependencies": {
+     "bs-custom-file-input": "^1.3.4"
+   },
    "devDependencies": {
 -    "eslint": "^6.8.0"
 +    "eslint": "^7.3.1"
    }
  }

diff --cc yarn.lock
Simple merge