From 4155da065c4578eb3da222eb010c69b99f655045 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@codiqa.com>
Date: Tue, 3 Dec 2013 17:56:35 -0600
Subject: [PATCH] Scroll improvements

---
 dist/css/ionic.css               | 3 +--
 dist/css/themes/ionic-ios7.css   | 1 -
 dist/js/ionic.js                 | 2 +-
 js/ext/angular/test/content.html | 6 +-----
 js/views/scrollZyng.js           | 2 +-
 scss/_scaffolding.scss           | 2 +-
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index 522384d6f5..b2ae4e0de0 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -1,4 +1,3 @@
-@charset "UTF-8";
 /*!
  * Copyright 2013 Drifty Co.
  * http://drifty.com/
@@ -2354,7 +2353,7 @@ body, .ionic-body {
   bottom: 44px; }
 
 .has-tabs {
-  bottom: 44px; }
+  bottom: 49px; }
 
 .pane {
   position: fixed;
diff --git a/dist/css/themes/ionic-ios7.css b/dist/css/themes/ionic-ios7.css
index 1e5a055c50..23bcd03921 100644
--- a/dist/css/themes/ionic-ios7.css
+++ b/dist/css/themes/ionic-ios7.css
@@ -1,4 +1,3 @@
-@charset "UTF-8";
 /*!
  * Copyright 2013 Drifty Co.
  * http://drifty.com/
diff --git a/dist/js/ionic.js b/dist/js/ionic.js
index 91fa83dfe1..af3dac6bfc 100644
--- a/dist/js/ionic.js
+++ b/dist/js/ionic.js
@@ -3424,7 +3424,7 @@ var Scroller;
     	Math.min(this.__container.clientWidth, this.__container.parentElement.clientWidth), 
     	Math.min(this.__container.clientHeight, this.__container.parentElement.clientHeight), 
     	this.__content.offsetWidth, 
-    	this.__content.offsetHeight+50);
+    	this.__content.offsetHeight+80);
   },
   /*
   ---------------------------------------------------------------------------
diff --git a/js/ext/angular/test/content.html b/js/ext/angular/test/content.html
index 5d83ff396f..764820ba7a 100644
--- a/js/ext/angular/test/content.html
+++ b/js/ext/angular/test/content.html
@@ -69,7 +69,7 @@
         on-refresh="onRefresh()"
         on-refresh-opening="onRefreshOpening(amount)"
         refresh-complete="refreshComplete"
-        has-footer="true"
+        has-tabs="true"
         has-header="true"
         has-subheader="true"
         >
@@ -78,10 +78,6 @@
           <li class="list-item" ng-repeat="item in items">asdf{{$index}}</li>
         </ul>
       </content>
-
-      <footer-bar type="bar-assertive">
-        <h1 class="title">Footer</h1>
-      </footer-bar>
       <nav id="tab-bar" class="tabs tabs-icon-top">
         <a class="tab-item" href="#">
           <i class="icon ion-game-controller-a"></i>
diff --git a/js/views/scrollZyng.js b/js/views/scrollZyng.js
index 0b300e626e..1e8e57be0b 100644
--- a/js/views/scrollZyng.js
+++ b/js/views/scrollZyng.js
@@ -590,7 +590,7 @@ var Scroller;
     	Math.min(this.__container.clientWidth, this.__container.parentElement.clientWidth), 
     	Math.min(this.__container.clientHeight, this.__container.parentElement.clientHeight), 
     	this.__content.offsetWidth, 
-    	this.__content.offsetHeight+50);
+    	this.__content.offsetHeight+80);
   },
   /*
   ---------------------------------------------------------------------------
diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss
index c03b3d0c45..a665e49996 100644
--- a/scss/_scaffolding.scss
+++ b/scss/_scaffolding.scss
@@ -186,7 +186,7 @@ body, .ionic-body {
 
 // Specify that a content area will have tabs
 .has-tabs {
-  bottom: 44px;
+  bottom: 49px;
 }
 
 // A full screen section with a solid background