Remove iOS status bar height overrides

No need to have rules to avoid overlapping the <iOS 7 status bar any more.

8 files changed, 27 insertions, 39 deletions

diff --git a/www/cobrands/cuidomiciudad/css/style.css b/www/cobrands/cuidomiciudad/css/style.css
index b50f822..db3112f 100644
--- a/www/cobrands/cuidomiciudad/css/style.css
+++ b/www/cobrands/cuidomiciudad/css/style.css
@@ -1,11 +1,11 @@
 /* line 8, style.scss */
-.ios7 .ui-bar-a,
-body.ios7 {
+.ios .ui-bar-a,
+body.ios {
   background-color: #005cb9;
 }
 
 /* line 13, style.scss */
-.ios7 .ui-bar-a {
+.ios .ui-bar-a {
   border-color: #005cb9;
 }
 
diff --git a/www/cobrands/cuidomiciudad/css/style.scss b/www/cobrands/cuidomiciudad/css/style.scss
index 3976a23..71cb081 100644
--- a/www/cobrands/cuidomiciudad/css/style.scss
+++ b/www/cobrands/cuidomiciudad/css/style.scss
@@ -5,12 +5,12 @@ $color-cmc-yellow: #eed11c;
 $color-cmc-green: #00ad68;
 $text-color: #eee;
 
-.ios7 .ui-bar-a,
-body.ios7 {
+.ios .ui-bar-a,
+body.ios {
     background-color: $color-cmc-blue;
 }
 
-.ios7 .ui-bar-a {
+.ios .ui-bar-a {
     border-color: $color-cmc-blue;
 }
 
diff --git a/www/cobrands/makemyisland/css/style.css b/www/cobrands/makemyisland/css/style.css
index e0ee20c..106d6e0 100644
--- a/www/cobrands/makemyisland/css/style.css
+++ b/www/cobrands/makemyisland/css/style.css
@@ -1,8 +1,8 @@
-.ios7 .ui-bar-a,
-body.ios7 {
+.ios .ui-bar-a,
+body.ios {
   background-color: #9fd9ea; }
 
-.ios7 .ui-bar-a {
+.ios .ui-bar-a {
   border-color: #9fd9ea; }
 
 #load-screen,
diff --git a/www/cobrands/makemyisland/css/style.scss b/www/cobrands/makemyisland/css/style.scss
index ea8c43c..195d7f1 100644
--- a/www/cobrands/makemyisland/css/style.scss
+++ b/www/cobrands/makemyisland/css/style.scss
@@ -3,12 +3,12 @@
 $yellow: rgb(249, 255, 198);
 $blue: rgb(159, 217, 234);
 
-.ios7 .ui-bar-a,
-body.ios7 {
+.ios .ui-bar-a,
+body.ios {
     background-color: $blue;
 }
 
-.ios7 .ui-bar-a {
+.ios .ui-bar-a {
     border-color: $blue;
 }
 
diff --git a/www/css/fms.css b/www/css/fms.css
index c1c7365..dd2411f 100644
--- a/www/css/fms.css
+++ b/www/css/fms.css
@@ -160,38 +160,37 @@
         background-color: rgba(0,0,0,0);
     }
 
-/* ios 7 tweaks to deal with different status bar behaviour */
-    .ios7 .ui-mobile-viewport {
+/* ios tweaks to deal with different status bar behaviour */
+    .ios .ui-mobile-viewport {
         background-color: none;
         background-image: none;
     }
 
-    .ios7 .ui-bar-a,
-    body.ios7 {
+    .ios .ui-bar-a,
+    body.ios {
         background-color: #F6BE41;
         background-image: none;
     }
 
-    .ios7 .ui-bar-a {
+    .ios .ui-bar-a {
         border-color: #F6BE41;
     }
 
-    .ios7 .ui-header-fixed .ui-btn-left,
-    .ios7 .ui-header-fixed .ui-btn-right {
+    .ios .ui-header-fixed .ui-btn-left,
+    .ios .ui-header-fixed .ui-btn-right {
         top: 4px;
     }
 
-    .ios7 #map_box {
-        top: 20px;
+    .ios #map_box {
         background-color: #534741;
         background-image: url('../images/mapbg.png');
     }
 
-    .ios7 #around-page #locating {
-        bottom: -22px;
+    .ios #around-page #locating {
+        bottom: -2px;
     }
 
-    .ios7 #map_box .olLayerDiv div {
+    .ios #map_box .olLayerDiv div {
         display: block !important;
     }
 
@@ -210,7 +209,7 @@
     #drafts,
     div[data-role='content'] {
         position: relative;
-        margin: 20px 10px;
+        margin: 10px 10px 20px 10px;
         background-color: rgba(255, 255, 255, 0.9);
     }
 
diff --git a/www/js/app.js b/www/js/app.js
index 71a4f97..8502581 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -295,11 +295,7 @@ 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');
-                    }
+                    $('body').addClass('ios');
                 }
 
                 _.extend(FMS, {
@@ -318,9 +314,6 @@ var tpl = {
                 }
 
                 FMS.windowHeight = $(window).height();
-                if ( $('body').hasClass('ios7') ) {
-                    FMS.windowHeight -= 20;
-                }
 
                 if ( localStorage.usedBefore ) {
                     FMS.usedBefore = 1;
diff --git a/www/js/map-OpenLayers.js b/www/js/map-OpenLayers.js
index a3fdc9d..f94f3ce 100644
--- a/www/js/map-OpenLayers.js
+++ b/www/js/map-OpenLayers.js
@@ -202,13 +202,9 @@ 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: mapTop, left: 0, right: 0, bottom: 0,
+            top: 0, left: 0, right: 0, bottom: 0,
             height: FMS.windowHeight,
             margin: 0
         });
diff --git a/www/js/views/fms.js b/www/js/views/fms.js
index aef854f..4e1a0a4 100644
--- a/www/js/views/fms.js
+++ b/www/js/views/fms.js
@@ -2,7 +2,7 @@
     _.extend( FMS, {
         FMSView: Backbone.View.extend({
             tag: 'div',
-            bottomMargin: 20,
+            bottomMargin: 0,
             contentSelector: '[data-role="content"]',
 
             events: {