From a5c83525f06fa8cddd24bd4fe5c4428d34da5f51 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 29 Nov 2013 08:50:17 -0600
Subject: [PATCH] Flexbox tweaks

---
 dist/css/ionic.css                             | 13 +++++++++++++
 dist/js/ionic-angular.js                       |  2 +-
 js/ext/angular/src/directive/ionicNavRouter.js |  2 +-
 js/ext/angular/test/navRouter.html             |  2 +-
 scss/_scaffolding.scss                         | 12 ++++++++++++
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index 48acc5fd5b..90b67ecc4c 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -2245,6 +2245,7 @@ body, .ionic-body {
   height: 100%; }
 
 .scroll-content {
+  display: block;
   position: relative;
   overflow: hidden;
   width: auto;
@@ -2364,6 +2365,18 @@ body, .ionic-body {
   background-color: #fff;
   vertical-align: top; }
 
+.page {
+  display: block;
+  position: relative;
+  overflow: hidden;
+  width: auto;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+  -moz-box-flex: 1;
+  -moz-flex: 1;
+  -ms-flex: 1;
+  flex: 1; }
+
 /**
  * Typography
  * --------------------------------------------------
diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index 4bd47d427d..4ac2bee54f 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -1670,7 +1670,7 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
     scope: true,
     require: '^navRouter',
     link: function($scope, $element, $attr, navCtrl) {
-      $element.addClass('pane');
+      $element.addClass('page');
 
       $scope.icon = $attr.icon;
       $scope.iconOn = $attr.iconOn;
diff --git a/js/ext/angular/src/directive/ionicNavRouter.js b/js/ext/angular/src/directive/ionicNavRouter.js
index e6220ad7f5..5641f02fea 100644
--- a/js/ext/angular/src/directive/ionicNavRouter.js
+++ b/js/ext/angular/src/directive/ionicNavRouter.js
@@ -307,7 +307,7 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
     scope: true,
     require: '^navRouter',
     link: function($scope, $element, $attr, navCtrl) {
-      $element.addClass('pane');
+      $element.addClass('page');
 
       $scope.icon = $attr.icon;
       $scope.iconOn = $attr.iconOn;
diff --git a/js/ext/angular/test/navRouter.html b/js/ext/angular/test/navRouter.html
index 6d9360a644..bc54780200 100644
--- a/js/ext/angular/test/navRouter.html
+++ b/js/ext/angular/test/navRouter.html
@@ -21,7 +21,7 @@
     </pane>
 
     <script id="page1.html" type="text/ng-template">
-      <nav-page title="'Bears'">
+      <nav-page title="'Bears'" hide-back-button="true">
         <h1>Page 1</h1>
         <span>{{num}}</span>
         <a class="button button-pure" nav-back>Back</a>
diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss
index 31e50a52b0..450c94dc3d 100644
--- a/scss/_scaffolding.scss
+++ b/scss/_scaffolding.scss
@@ -59,6 +59,8 @@ body, .ionic-body {
 }
 
 .scroll-content {
+  display: block;
+
   position: relative;
   overflow: hidden;
 
@@ -159,3 +161,13 @@ body, .ionic-body {
   vertical-align: top;
 
 }
+
+.page {
+  display: block;
+
+  position: relative;
+  overflow: hidden;
+
+  width: auto;
+  @include flex(1);
+}