From 3362303b7df237a43e7ced3c12825308ebccb61e Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@gmail.com>
Date: Mon, 26 Aug 2013 13:16:22 -0500
Subject: [PATCH] Fixes #7

---
 dist/framework-with-theme.css                | 16 +++++++++++-----
 scss/framework/structure/_bar.scss           |  2 ++
 scss/framework/structure/_variables.scss     |  8 +++++---
 scss/framework/theme/default/_bar.scss       |  2 --
 scss/framework/theme/default/_variables.scss |  6 ++----
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/dist/framework-with-theme.css b/dist/framework-with-theme.css
index 96144c58e3..796546be3d 100644
--- a/dist/framework-with-theme.css
+++ b/dist/framework-with-theme.css
@@ -78,6 +78,12 @@ main > * {
   overflow: auto;
   height: 0; }
 
+.ptr-content .pulling {
+  display: none; }
+
+.ptr-content .refreshing {
+  display: none; }
+
 .button {
   position: relative;
   display: block;
@@ -100,7 +106,8 @@ main > * {
   -webkit-box-orient: horizontal;
   box-orient: horizontal;
   box-sizing: border-box;
-  height: 50px;
+  height: 44px;
+  padding: 8px;
   /*
   .title + .button:last-child,
   .button + .button:last-child,
@@ -118,7 +125,7 @@ main > * {
     display: block;
     width: 100%;
     */
-    line-height: 30px;
+    line-height: 26px;
     margin: 0;
     text-align: center;
     white-space: nowrap;
@@ -142,10 +149,10 @@ main > * {
 /* 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 */
 .bar-header ~ main, .has-header {
-  top: 50px; }
+  top: 44px; }
 
 .has-footer {
-  bottom: 50px; }
+  bottom: 44px; }
 
 /* Bar docked to bottom used for primary app navigation */
 .tabs {
@@ -319,7 +326,6 @@ a.list-item {
   background-color: white;
   border-style: solid;
   border-width: 0;
-  padding: 10px;
   /*
   Disabled temporarily because it's annoying for testing.
   @media screen and (orientation : landscape) {
diff --git a/scss/framework/structure/_bar.scss b/scss/framework/structure/_bar.scss
index 6fc0bcdfac..b505d43892 100644
--- a/scss/framework/structure/_bar.scss
+++ b/scss/framework/structure/_bar.scss
@@ -15,6 +15,8 @@
 
   height: $barHeight;
 
+  padding: $barPaddingPortrait;
+
   // Title inside of a bar is centered
   .title {
     /*
diff --git a/scss/framework/structure/_variables.scss b/scss/framework/structure/_variables.scss
index b5454d2304..781bdfbd7a 100644
--- a/scss/framework/structure/_variables.scss
+++ b/scss/framework/structure/_variables.scss
@@ -15,11 +15,13 @@ $baseLineHeightComputed:    floor($baseFontSize * $baseLineHeight); // ~20px
 $contentPadding: 10px;
 
 // Bar stuff
-$barHeight: 50px !default;
-$barLineHeight: 50px !default;
+$barHeight: 44px !default;
+$barLineHeight: 44px !default;
 $barTitleFontSize: $fontSizeLarge;
-$barTitleLineHeightComputed: 30px;//$barHeight - 2;
+$barTitleLineHeightComputed: 26px;//$barHeight - 2;
 $barPaddingVertical: (($barHeight - $baseLineHeightComputed) / 2);
+$barPaddingPortrait: 8px;
+$barPaddingLandscape : 5px;
 
 
 
diff --git a/scss/framework/theme/default/_bar.scss b/scss/framework/theme/default/_bar.scss
index 68905a7169..ca07156cdf 100644
--- a/scss/framework/theme/default/_bar.scss
+++ b/scss/framework/theme/default/_bar.scss
@@ -3,8 +3,6 @@
   border-style: solid;
   border-width: 0;
 
-  padding: $barPaddingPortrait;
-
   &.bar-header {
     border-bottom-width: 1px;
   }
diff --git a/scss/framework/theme/default/_variables.scss b/scss/framework/theme/default/_variables.scss
index 95fabb052a..43a118050c 100644
--- a/scss/framework/theme/default/_variables.scss
+++ b/scss/framework/theme/default/_variables.scss
@@ -45,9 +45,6 @@ $buttonDarkBorder: #111;
 
 //
 // Bars
-$barPaddingPortrait: 10px;
-$barPaddingLandscape : 5px;
-
 $barBackground: white;
 
 // Bar variations
@@ -74,7 +71,8 @@ $barDangerBorderColor: #bc4435;
 
 $barDarkBackground: #444;
 $barDarkBorderColor: #111;
-//
+
+
 // Lists
 $listDividerBackground: #f5f5f5;
 $listDividerColor: #222;