Merge pull request #3552 from rugk/patch-1

[rails.git] / app / assets / javascripts / leaflet.share.js

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 8705f47ffa3a96e321598d8ace9a18d0c99c5606..1817e71ccd03d2b759618cf3dd576e3f08cf69d3 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -25,9 +25,8 @@ L.OSM.share = function (options) {
       .attr("class", "sidebar_heading")
       .appendTo($ui)
       .append(
-        $("<span>")
-          .text(I18n.t("javascripts.close"))
-          .attr("class", "icon close")
+        $("<button type='button' class='btn-close float-end mt-1'>")
+          .attr("aria-label", I18n.t("javascripts.close"))
           .bind("click", toggle))
       .append(
         $("<h4>")
@@ -44,19 +43,20 @@ L.OSM.share = function (options) {
       .appendTo($linkSection);
 
     var $form = $("<form>")
-      .attr("class", "standard-form")
       .appendTo($linkSection);
 
     $("<div>")
-      .attr("class", "standard-form-row")
+      .attr("class", "form-check mb-3")
       .appendTo($form)
       .append(
         $("<label>")
           .attr("for", "link_marker")
+          .attr("class", "form-check-label")
           .append(
             $("<input>")
               .attr("id", "link_marker")
               .attr("type", "checkbox")
+              .attr("class", "form-check-input")
               .bind("change", toggleMarker))
           .append(I18n.t("javascripts.share.include_marker")));
 
@@ -91,7 +91,7 @@ L.OSM.share = function (options) {
       });
 
     $("<div>")
-      .attr("class", "standard-form-row share-tab")
+      .attr("class", "share-tab")
       .css("display", "block")
       .appendTo($form)
       .append($("<input>")
@@ -100,7 +100,7 @@ L.OSM.share = function (options) {
         .on("click", select));
 
     $("<div>")
-      .attr("class", "standard-form-row share-tab")
+      .attr("class", "share-tab")
       .appendTo($form)
       .append($("<input>")
         .attr("id", "short_input")
@@ -108,7 +108,7 @@ L.OSM.share = function (options) {
         .on("click", select));
 
     $("<div>")
-      .attr("class", "standard-form-row share-tab")
+      .attr("class", "share-tab")
       .appendTo($form)
       .append(
         $("<textarea>")
@@ -153,26 +153,26 @@ L.OSM.share = function (options) {
 
     $form = $("<form>")
       .attr("id", "export-image")
-      .attr("class", "standard-form")
       .attr("action", "/export/finish")
       .attr("method", "post")
       .appendTo($imageSection);
 
     $("<div>")
-      .attr("class", "standard-form-row")
+      .attr("class", "mb-3 form-check")
       .appendTo($form)
       .append(
         $("<label>")
           .attr("for", "image_filter")
+          .attr("class", "form-check-label")
           .append(
             $("<input>")
               .attr("id", "image_filter")
               .attr("type", "checkbox")
+              .attr("class", "form-check-input")
               .bind("change", toggleFilter))
           .append(I18n.t("javascripts.share.custom_dimensions")));
 
     $("<div>")
-      .attr("class", "standard-form-row")
       .appendTo($form)
       .append(
         $("<label>")
@@ -187,7 +187,6 @@ L.OSM.share = function (options) {
         .append($("<option>").val("pdf").text("PDF")));
 
     $("<div>")
-      .attr("class", "standard-form-row")
       .appendTo($form)
       .append($("<label>")
         .attr("for", "mapnik_scale")
@@ -234,6 +233,7 @@ L.OSM.share = function (options) {
 
     $("<input>")
       .attr("type", "submit")
+      .attr("class", "btn btn-primary")
       .attr("value", I18n.t("javascripts.share.download"))
       .appendTo($form);