3 files changed, 43 insertions, 2 deletions
diff --git a/src/css/fms.css b/src/css/fms.css
index d8d4563..e817025 100644
--- a/src/css/fms.css
+++ b/src/css/fms.css
@@ -56,6 +56,35 @@
         background-color: #534741;
         background-image: url('../images/mapbg.png');
     }
+    .ios7 .ui-mobile-viewport {
+        background-color: none;
+        background-image: none;
+    }
+
+    .ios7 .ui-page-active {
+        padding-top: 20px;
+    }
+
+    .ios7 #locating,
+    .ios7 #load-screen {
+        margin-top: 20px;
+    }
+
+    .ios7 .ui-bar-a,
+    body.ios7 {
+        background-color: #F6BE41;
+        background-image: none;
+    }
+
+    .ios7 .ui-bar-a {
+        border-color: #F6BE41;
+    }
+
+    .ios7 #map_box {
+        top: 20px;
+        background-color: #534741;
+        background-image: url('../images/mapbg.png');
+    }
 
     .ui-icon-plus,
     .ui-icon-minus,
diff --git a/src/js/app.js b/src/js/app.js
index 1818b6e..0f2a7bf 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -243,6 +243,11 @@ var tpl = {
                 if ( typeof device !== 'undefined' && device.platform === 'iOS' ) {
                     var model = parseInt(device.model.replace('iPhone',''), 10);
                     FMS.iPhoneModel = model;
+
+                    // fix overlap of status bar in ios7
+                    if (parseFloat(window.device.version) === 7.0) {
+                        $('body').addClass('ios7');
+                    }
                 }
 
                 _.extend(FMS, {
@@ -261,6 +266,9 @@ var tpl = {
                 }
 
                 FMS.windowHeight = $(window).height();
+                if ( $('body').hasClass('ios7') ) {
+                    FMS.windowHeight -= 20;
+                }
 
                 if ( localStorage.usedBefore ) {
                     FMS.usedBefore = 1;
diff --git a/src/js/map-OpenLayers.js b/src/js/map-OpenLayers.js
index f6bc663..e9cee86 100644
--- a/src/js/map-OpenLayers.js
+++ b/src/js/map-OpenLayers.js
@@ -202,10 +202,14 @@ OpenLayers.Map.prototype.getCurrentSize = function() {
 function show_map(event) {
     if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') {
         // Immediately go full screen map if on around page
+        var mapTop = 0;
+        if ( $('body').hasClass('ios7') ) {
+            mapTop = 20;
+        }
         $('#map_box').css({
             position: 'fixed',
-            top: 0, left: 0, right: 0, bottom: 0,
-            height: $(window).height(),
+            top: mapTop, left: 0, right: 0, bottom: 0,
+            height: FMS.windowHeight,
             margin: 0
         });
     } else {