Changed sidebar close button to Bootstrap

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 5c5e43c5c20351b3abf537a9bd55d13f5078dff2..5e541f1e5821885c9b4e5bc15d6ca18e96cf4e03 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -22,9 +22,8 @@ L.OSM.layers = function (options) {
       .attr("class", "sidebar_heading")
       .appendTo($ui)
       .append(
       .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>")
           .bind("click", toggle))
       .append(
         $("<h4>")

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 8ab10773b8c4c0530212c7d8e1b932cfdfbc079b..5a03c49e1f54383c79f2747a4a66a30bd1f9ab13 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -633,11 +633,6 @@ body.compact-nav {
   padding: $lineheight/2 $lineheight;
   // background: $offwhite;
   // border-bottom: 1px solid $grey;
   padding: $lineheight/2 $lineheight;
   // background: $offwhite;
   // border-bottom: 1px solid $grey;

-  > .close {
-    float: right;
-    margin-top: 2px;
-    cursor: pointer;
-  }

 }
 
 #browse_status {
 }
 
 #browse_status {