From c6c85730a44e11dfad40ac72310ac24b3518fd05 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 6 Nov 2013 21:35:00 -0600
Subject: [PATCH] button bar button tweaks

---
 Gruntfile.js               |  1 -
 dist/css/ionic.css         |  8 +++++---
 scss/ionic/_bar.scss       | 12 +++++++-----
 scss/ionic/_variables.scss |  5 +----
 test/headers.html          |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 44d99ed84d..3e0c991ec3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -84,7 +84,6 @@ module.exports = function(grunt) {
       dist: {
         files: {
           'dist/css/ionic.css': 'scss/ionic/ionic.scss',
-          'dist/css/ionic-scoped.css': 'scss/ionic/ionic-scoped.scss',
           'dist/css/ionic-ios7.css': 'scss/ionic-ios7/ionic-ios7.scss'
         }
       }
diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index 1c37f9f594..db34bd15c6 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -2510,16 +2510,18 @@ a.subduedΓÇÄ {
   .bar > .button {
     z-index: 1;
     padding: 0 8px;
-    min-width: 43px;
+    height: 32px;
+    min-width: 44px;
     min-height: 31px;
     font-size: 12px;
-    line-height: 30px; }
+    line-height: 29px; }
     .bar > .button .icon {
       font-size: 24px;
       line-height: 29px; }
   .bar .button-bar > .button {
+    height: 32px;
     min-height: 31px;
-    line-height: 31px; }
+    line-height: 30px; }
   .bar .button-bar + .button, .bar .button + .button-bar {
     margin-left: 5px; }
   .bar .title + .button:last-child,
diff --git a/scss/ionic/_bar.scss b/scss/ionic/_bar.scss
index 73fe4fa6a9..e7ab11ed4a 100644
--- a/scss/ionic/_bar.scss
+++ b/scss/ionic/_bar.scss
@@ -104,20 +104,22 @@
   > .button {
     z-index: 1;
     padding: 0 $button-bar-button-padding;
+    height: $button-bar-button-height;
     min-width: $button-bar-button-height + $button-bar-button-font-size;
-    min-height: $button-bar-button-height;
+    min-height: $button-bar-button-height - 1;
     font-size: $button-bar-button-font-size;
-    line-height: $button-bar-button-height - $button-border-width;
+    line-height: $button-bar-button-height - $button-border-width - 2;
 
     .icon {
       font-size: $button-bar-button-icon-size;
-      line-height: $button-bar-button-height - $button-border-width - 1;
+      line-height: $button-bar-button-height - $button-border-width - 2;
     }
   }
 
   .button-bar > .button {
-    min-height: $button-bar-button-height;
-    line-height: $button-bar-button-height;
+    height: $button-bar-button-height;
+    min-height: $button-bar-button-height - 1;
+    line-height: $button-bar-button-height - 2;
   }
 
   .button-bar + .button, .button + .button-bar {
diff --git a/scss/ionic/_variables.scss b/scss/ionic/_variables.scss
index 4fd31e8eaf..06d2304105 100644
--- a/scss/ionic/_variables.scss
+++ b/scss/ionic/_variables.scss
@@ -231,7 +231,7 @@ $button-small-padding:            4px !default;
 $button-small-icon-size:          16px;
 
 $button-bar-button-font-size:     12px;
-$button-bar-button-height:        31px;
+$button-bar-button-height:        32px;
 $button-bar-button-padding:       8px !default;
 $button-bar-button-icon-size:     24px;
 
@@ -280,9 +280,6 @@ $button-dark-active-border:       #000;
 // -------------------------------
 
 $bar-height:                     44px !default;
-$bar-button-line-height:         23px !default;
-$bar-button-clear-line-height:   34px !default;
-$bar-button-bar-line-height:     18px !default;
 $bar-title-font-size:            $font-size-large;
 $bar-padding-portrait:           5px;
 $bar-padding-landscape:          5px;
diff --git a/test/headers.html b/test/headers.html
index d955527f78..90489d2b05 100644
--- a/test/headers.html
+++ b/test/headers.html
@@ -26,7 +26,7 @@
 
       <div class="bar bar-header-secondary bar-success">
         <a class="button">
-          <i class="icon ion-home"></i> Home
+          <i class="icon ion-navicon"></i> Home
         </a>
         <div class="button-bar">
           <a class="button">Success</a>
@@ -40,7 +40,7 @@
 
       <header class="bar bar-header bar-default">
         <a class="button button-default">
-          <i class="icon ion-home"></i> Home
+          <i class="icon ion-navicon"></i> Home
         </a>
         <div class="button-bar">
           <a class="button">Success</a>