Merge pull request #2389 from librenms/revert-2383-f0o-mapheight-patch

Revert 0402afe5f2
This commit is contained in:
Daniel Preussker
2015-11-05 10:50:04 +01:00
2 changed files with 5 additions and 2 deletions
+5 -1
View File
@@ -1754,10 +1754,14 @@ tr.search:nth-child(odd) {
top:30px;
}
#leaflet-map {
height: 600px;
}
.edit-storage-input {
width: 100px;
}
label {
font-weight: normal;
}
}
-1
View File
@@ -152,7 +152,6 @@ marker.bindPopup(title);
$temp_output .= 'map.addLayer(markers);
map.scrollWheelZoom.disable();
$(document).ready(function(){
$("#leaflet-map").css("height",($("#leaflet-map").parent().innerHeight()-55) + "px");
$("#leaflet-map").on("click", function(event) {
map.scrollWheelZoom.enable();
});