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

[rails.git] / app / assets / javascripts / leaflet.sidebar-pane.js

diff --git a/app/assets/javascripts/leaflet.sidebar-pane.js b/app/assets/javascripts/leaflet.sidebar-pane.js
index d8213a3767a948aee2c0a9cdadc5498cbf1d4208..7408585f26adbd19dfd1f57d3d87fd49c16fab6e 100644 (file)
--- a/app/assets/javascripts/leaflet.sidebar-pane.js
+++ b/app/assets/javascripts/leaflet.sidebar-pane.js
@@ -1,11 +1,11 @@
 L.OSM.sidebarPane = function (options, uiClass, buttonTitle, paneTitle) {
 L.OSM.sidebarPane = function (options, uiClass, buttonTitle, paneTitle) {

-  var control = L.control(options);
+  const control = L.control(options);

 
   control.onAdd = function (map) {
 
   control.onAdd = function (map) {

-    var $container = $("<div>")
+    const $container = $("<div>")

       .attr("class", "control-" + uiClass);
 
       .attr("class", "control-" + uiClass);
 

-    var button = $("<a>")
+    const button = $("<a>")

       .attr("class", "control-button")
       .attr("href", "#")
       .html("<span class=\"icon " + uiClass + "\"></span>")
       .attr("class", "control-button")
       .attr("href", "#")
       .html("<span class=\"icon " + uiClass + "\"></span>")


@@ -17,17 +17,12 @@ L.OSM.sidebarPane = function (options, uiClass, buttonTitle, paneTitle) {
 
     button.appendTo($container);
 
 
     button.appendTo($container);
 

-    var $ui = $("<div>")
-      .attr("class", uiClass + "-ui");
-
-    $("<div class='sidebar_heading d-flex'>")
-      .appendTo($ui)
-      .append($("<h4 class='flex-grow-1 text-break'>")
-        .text(I18n.t(paneTitle)))
-      .append($("<div>")
-        .append($("<button type='button' class='btn-close'>")
-          .attr("aria-label", I18n.t("javascripts.close"))
-          .bind("click", toggle)));
+    const $ui = $("<div>")
+      .attr("class", `${uiClass}-ui position-relative z-n1`);
+
+    $("<h2 class='p-3 pb-0 pe-5 text-break'>")
+      .text(I18n.t(paneTitle))
+      .appendTo($ui);

 
     options.sidebar.addPane($ui);
 
 
     options.sidebar.addPane($ui);