1 files changed, 26 insertions, 0 deletions
diff --git a/www/lib/ionic/scss/_scaffolding.scss b/www/lib/ionic/scss/_scaffolding.scss
index 4c768c9f..d1caf7ab 100644
--- a/www/lib/ionic/scss/_scaffolding.scss
+++ b/www/lib/ionic/scss/_scaffolding.scss
@@ -36,6 +36,7 @@ body,
   color: $base-color;
   word-wrap: break-word;
   font-size: $font-size-base;
+  font-family: -apple-system;
   font-family: $font-family-base;
   line-height: $line-height-computed;
   text-rendering: optimizeLegibility;
@@ -83,6 +84,14 @@ body.grade-c {
   display: block;
   overflow: hidden;
 
+  &.overflow-scroll {
+    position: relative;
+  }
+
+  &.scroll-x { overflow-x: scroll; overflow-y: hidden; }
+  &.scroll-y { overflow-x: hidden; overflow-y: scroll; }
+  &.scroll-xy { overflow-x: scroll; overflow-y: scroll; }
+
   // Hide the top border if any
   margin-top: -1px;
 }
@@ -185,17 +194,30 @@ ion-infinite-scroll {
   overflow-x: hidden;
   overflow-y: scroll;
   -webkit-overflow-scrolling: touch;
+
+  // Make sure the scrollbar doesn't take up layout space on edge
+  -ms-overflow-style: -ms-autohiding-scrollbar;
+
   top: 0;
   right: 0;
   bottom: 0;
   left: 0;
   position: absolute;
 
+  &.pane {
+    overflow-x: hidden;
+    overflow-y: scroll;
+  }
+
   .scroll {
     position: static;
     height: 100%;
     -webkit-transform: translate3d(0, 0, 0);   // fix iOS bug where relative children of scroller disapear while scrolling.  see: http://stackoverflow.com/questions/9807620/ipad-safari-scrolling-causes-html-elements-to-disappear-and-reappear-with-a-dela
   }
+
+  &.keyboard-up:not(.keyboard-up-confirm) {
+    overflow: hidden;
+  }
 }
 
 
@@ -236,6 +258,10 @@ ion-infinite-scroll {
   }
 }
 
+.bar-subfooter.has-tabs {
+  bottom: $tabs-height + $bar-footer-height;
+}
+
 .has-footer.has-tabs {
   bottom: $tabs-height + $bar-footer-height;
 }