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

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

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index b12c0c89d79bc56500a445cd242a1f223692e4ef..5c5e43c5c20351b3abf537a9bd55d13f5078dff2 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -34,7 +34,7 @@ L.OSM.layers = function (options) {
       .attr("class", "section base-layers")
       .appendTo($ui);
 
       .attr("class", "section base-layers")
       .appendTo($ui);
 

-    var baseLayers = $("<ul>")
+    var baseLayers = $("<ul class='list-unstyled'>")

       .appendTo(baseSection);
 
     layers.forEach(function (layer) {
       .appendTo(baseSection);
 
     layers.forEach(function (layer) {


@@ -84,9 +84,9 @@ L.OSM.layers = function (options) {
         .appendTo(item);
 
       var input = $("<input>")
         .appendTo(item);
 
       var input = $("<input>")

-         .attr("type", "radio")
-         .prop("checked", map.hasLayer(layer))
-         .appendTo(label);
+        .attr("type", "radio")
+        .prop("checked", map.hasLayer(layer))
+        .appendTo(label);

 
       label.append(layer.options.name);
 
 
       label.append(layer.options.name);
 


@@ -116,10 +116,10 @@ L.OSM.layers = function (options) {
 
       $("<p>")
         .text(I18n.t("javascripts.map.layers.overlays"))
 
       $("<p>")
         .text(I18n.t("javascripts.map.layers.overlays"))

-        .attr("class", "deemphasize")
+        .attr("class", "text-muted")

         .appendTo(overlaySection);
 
         .appendTo(overlaySection);
 

-      var overlays = $("<ul>")
+      var overlays = $("<ul class='list-unstyled form-check'>")

         .appendTo(overlaySection);
 
       var addOverlay = function (layer, name, maxArea) {
         .appendTo(overlaySection);
 
       var addOverlay = function (layer, name, maxArea) {


@@ -130,12 +130,14 @@ L.OSM.layers = function (options) {
           .appendTo(overlays);
 
         var label = $("<label>")
           .appendTo(overlays);
 
         var label = $("<label>")

+          .attr("class", "form-check-label")

           .appendTo(item);
 
         var checked = map.hasLayer(layer);
 
         var input = $("<input>")
           .attr("type", "checkbox")
           .appendTo(item);
 
         var checked = map.hasLayer(layer);
 
         var input = $("<input>")
           .attr("type", "checkbox")

+          .attr("class", "form-check-input")

           .prop("checked", checked)
           .appendTo(label);
 
           .prop("checked", checked)
           .appendTo(label);