From cb06c5580a96c9a67af65a5c45182430efbf290d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 22 Jul 2015 11:51:08 -0500
Subject: [PATCH] toolbar buttons e2e

---
 ionic/components/button/button.scss               |  2 +-
 ionic/components/toolbar/extensions/material.scss |  2 +-
 ionic/components/toolbar/test/scenarios/main.html | 10 ++++++----
 ionic/components/toolbar/toolbar-buttons.scss     | 11 ++++++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ionic/components/button/button.scss b/ionic/components/button/button.scss
index 907a49fab6..d6b8bc62a3 100644
--- a/ionic/components/button/button.scss
+++ b/ionic/components/button/button.scss
@@ -41,7 +41,7 @@ button,
   will-change: transform;
 
   margin: $button-margin;
-  line-height: 1;
+  line-height: 1.1;
 
   @include appearance(none);
 
diff --git a/ionic/components/toolbar/extensions/material.scss b/ionic/components/toolbar/extensions/material.scss
index 708a7a59b9..e081a527dc 100644
--- a/ionic/components/toolbar/extensions/material.scss
+++ b/ionic/components/toolbar/extensions/material.scss
@@ -3,7 +3,7 @@
 // --------------------------------------------------
 
 $toolbar-material-title-font-size:         2rem !default;
-$toolbar-material-button-font-size:        24px !default;
+$toolbar-material-button-font-size:        1.8rem !default;
 
 
 .toolbar[mode="md"] {
diff --git a/ionic/components/toolbar/test/scenarios/main.html b/ionic/components/toolbar/test/scenarios/main.html
index 66dfda16be..c8d22d9af1 100644
--- a/ionic/components/toolbar/test/scenarios/main.html
+++ b/ionic/components/toolbar/test/scenarios/main.html
@@ -14,15 +14,17 @@
 <ion-toolbar><ion-nav-items primary><button primary>Btn</button></ion-nav-items><ion-title>Title</ion-title><ion-nav-items secondary><button secondary>Btn</button><button secondary>Btn</button><button secondary>Btn</button></ion-nav-items></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button><icon name="ion-navicon"></icon></button><button><icon name="ion-heart"></icon></button></ion-nav-items><ion-nav-items secondary><button><icon name="ion-home"></icon></button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button><icon name="ion-navicon"></icon></button><button><icon name="ion-heart"></icon></button></ion-nav-items><ion-nav-items secondary><button><icon name="ion-ionic"></icon></button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button primary><icon name="ion-navicon"></icon></button primary><button primary><icon name="ion-star"></icon></button></ion-nav-items><ion-nav-items secondary><button secondary><icon name="ion-ionic"></icon></button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
-
 <ion-toolbar><ion-nav-items primary><button primary outline><icon name="ion-navicon"></icon></button primary><button primary outline><icon name="ion-star"></icon></button></ion-nav-items><ion-nav-items secondary><button secondary outline><icon name="ion-flag"></icon></button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button clear primary><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-title>Title</ion-title><ion-nav-items secondary><button clear secondary><icon name="ion-help-circled"></icon>Help</button></ion-nav-items></ion-toolbar>
+
+
+<ion-toolbar><ion-nav-items primary><button primary><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-nav-items secondary><button primary><icon name="ion-help-circled"></icon>Help</button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
+
 
 
 <style>
diff --git a/ionic/components/toolbar/toolbar-buttons.scss b/ionic/components/toolbar/toolbar-buttons.scss
index 0b72fee8c9..47a519b9b2 100644
--- a/ionic/components/toolbar/toolbar-buttons.scss
+++ b/ionic/components/toolbar/toolbar-buttons.scss
@@ -11,10 +11,19 @@
     margin: 0 4px;
     padding: 0 4px;
 
-    min-width: 3.2rem;
+    min-width: 2.8rem;
     min-height: 2.8rem;
 
     box-shadow: none;
+
+    &[clear] {
+      padding: 0;
+    }
+  }
+
+  icon {
+    font-size: 2.4rem;
+    padding: 0 4px;
   }
 }