From 7c97202ebd7c24ff5a98979fc22f70762d345f8f Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 21 Oct 2013 21:11:49 -0500
Subject: [PATCH] Derpty do

---
 dist/css/ionic-ios7.css      |  7 +++----
 dist/css/ionic-scoped.css    |  7 +++----
 dist/css/ionic.css           |  7 +++----
 scss/ionic/_scaffolding.scss | 11 ++++-------
 starters/map/index.html      |  2 +-
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css
index 13b53efdc3..f29fa52c17 100644
--- a/dist/css/ionic-ios7.css
+++ b/dist/css/ionic-ios7.css
@@ -370,20 +370,19 @@ body, .ionic-body {
 .content {
   position: absolute;
   width: 100%;
-  height: 100%;
   top: 0;
   bottom: 0;
   overflow: auto;
   -webkit-overflow-scrolling: touch; }
 
 .has-header {
-  margin-top: 44px; }
+  top: 44px; }
 
 .has-footer {
-  margin-bottom: 44px; }
+  bottom: 44px; }
 
 .has-tabs {
-  margin-bottom: 84px; }
+  bottom: 84px; }
 
 .page, .full-section {
   position: fixed;
diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css
index 1c10274572..6f67f69e8f 100644
--- a/dist/css/ionic-scoped.css
+++ b/dist/css/ionic-scoped.css
@@ -1142,17 +1142,16 @@
   .ionic .content {
     position: absolute;
     width: 100%;
-    height: 100%;
     top: 0;
     bottom: 0;
     overflow: auto;
     -webkit-overflow-scrolling: touch; }
   .ionic .has-header {
-    margin-top: 44px; }
+    top: 44px; }
   .ionic .has-footer {
-    margin-bottom: 44px; }
+    bottom: 44px; }
   .ionic .has-tabs {
-    margin-bottom: 84px; }
+    bottom: 84px; }
   .ionic .page, .ionic .full-section {
     position: fixed;
     top: 0;
diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index 03d8bc7fae..41253d69ac 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -1449,20 +1449,19 @@ body, .ionic-body {
 .content {
   position: absolute;
   width: 100%;
-  height: 100%;
   top: 0;
   bottom: 0;
   overflow: auto;
   -webkit-overflow-scrolling: touch; }
 
 .has-header {
-  margin-top: 44px; }
+  top: 44px; }
 
 .has-footer {
-  margin-bottom: 44px; }
+  bottom: 44px; }
 
 .has-tabs {
-  margin-bottom: 84px; }
+  bottom: 84px; }
 
 .page, .full-section {
   position: fixed;
diff --git a/scss/ionic/_scaffolding.scss b/scss/ionic/_scaffolding.scss
index b2d570e724..5558965664 100644
--- a/scss/ionic/_scaffolding.scss
+++ b/scss/ionic/_scaffolding.scss
@@ -72,9 +72,8 @@ body, .ionic-body {
 
 
 .content {
-  position: absolute; 
+  position: absolute;
   width: 100%;
-  height: 100%;
   top: 0;
   bottom: 0;
   overflow: auto;
@@ -84,18 +83,16 @@ body, .ionic-body {
 // Pad top/bottom of content so it doesn't hide behind .bar-title and .bar-tab.
 // Note: For these to work, content must come after both bars in the markup
 .has-header {
-  //top: $bar-height;
-  margin-top: $bar-height;
+  top: $bar-height;
 }
 
 .has-footer {
-  //bottom: $bar-height;
-  margin-bottom: $bar-height;
+  bottom: $bar-height;
 }
 
 // Specify that a content area will have tabs
 .has-tabs {
-  margin-bottom: 84px;
+  bottom: 84px;
 }
 
 .page, .full-section {
diff --git a/starters/map/index.html b/starters/map/index.html
index 5779e931c3..8261146da0 100644
--- a/starters/map/index.html
+++ b/starters/map/index.html
@@ -28,7 +28,7 @@
     <div class="bar bar-header bar-dark">
       <h1 class="title">Map</h1>
     </div>
-    <content>
+    <content has-header="true" has-footer="true">
       <div id="map"></div>
     </content>
     <div class="bar bar-footer bar-dark">