From 1a5bf414c31c1eefc32aa577390990cfddd7dda6 Mon Sep 17 00:00:00 2001
From: Daniel Preussker <f0o@users.noreply.github.com>
Date: Thu, 5 Nov 2015 09:49:24 +0000
Subject: [PATCH] Revert 0402afe5f234741578995143d379d3071ad145f5

---
 html/css/styles.css                   | 6 +++++-
 html/includes/common/worldmap.inc.php | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/html/css/styles.css b/html/css/styles.css
index d9fc4287d..46abbc37f 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -1754,10 +1754,14 @@ tr.search:nth-child(odd) {
     top:30px;
 }
 
+#leaflet-map {
+    height: 600px;
+}
+
 .edit-storage-input {
     width: 100px;
 }
 
 label {
     font-weight: normal;
-}
+}
\ No newline at end of file
diff --git a/html/includes/common/worldmap.inc.php b/html/includes/common/worldmap.inc.php
index bb6b48e01..bf9e6f36e 100644
--- a/html/includes/common/worldmap.inc.php
+++ b/html/includes/common/worldmap.inc.php
@@ -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();
     });