From 60624a7fe007587060df4f6f3c9f5af8ea66098c Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 29 Jul 2015 16:34:21 -0500
Subject: [PATCH] fix toolbar height

---
 ionic/components/toolbar/extensions/ios.scss      |  1 +
 ionic/components/toolbar/extensions/material.scss | 10 ++++++----
 ionic/components/toolbar/toolbar.scss             |  2 --
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ionic/components/toolbar/extensions/ios.scss b/ionic/components/toolbar/extensions/ios.scss
index 71839b79ec..c56308938e 100644
--- a/ionic/components/toolbar/extensions/ios.scss
+++ b/ionic/components/toolbar/extensions/ios.scss
@@ -17,6 +17,7 @@ $toolbar-ios-title-font-size:               1.7rem !default;
 
 .toolbar[mode="ios"] {
   border-bottom: 1px solid $toolbar-ios-border-color;
+  min-height: $toolbar-ios-height;
 
   .toolbar-title {
     order: map-get($toolbar-order-ios, title);
diff --git a/ionic/components/toolbar/extensions/material.scss b/ionic/components/toolbar/extensions/material.scss
index ed6d030fd0..5d2a56cbc4 100644
--- a/ionic/components/toolbar/extensions/material.scss
+++ b/ionic/components/toolbar/extensions/material.scss
@@ -2,18 +2,20 @@
 // Material Design Toolbar
 // --------------------------------------------------
 
-$toolbar-material-title-font-size:         2rem !default;
-$toolbar-material-button-font-size:        1.4rem !default;
+$toolbar-md-height:                       5.6rem !default;
+$toolbar-md-title-font-size:         2rem !default;
+$toolbar-md-button-font-size:        1.4rem !default;
 
 
 .toolbar[mode="md"] {
+  min-height: $toolbar-md-height;
 
   .toolbar-inner-title {
     padding: 0px 12px;
   }
 
   ion-title {
-    font-size: $toolbar-material-title-font-size;
+    font-size: $toolbar-md-title-font-size;
     font-weight: 500;
   }
 
@@ -23,7 +25,7 @@ $toolbar-material-button-font-size:        1.4rem !default;
 
   button,
   [button] {
-    font-size: $toolbar-material-button-font-size;
+    font-size: $toolbar-md-button-font-size;
   }
 
 }
diff --git a/ionic/components/toolbar/toolbar.scss b/ionic/components/toolbar/toolbar.scss
index ea968a11db..615798d728 100644
--- a/ionic/components/toolbar/toolbar.scss
+++ b/ionic/components/toolbar/toolbar.scss
@@ -19,8 +19,6 @@ $toolbar-title-text-color:              #000 !default;
   z-index: $z-index-toolbar;
 
   width: 100%;
-  height: 100%;
-  min-height: 4.4rem;
   padding: 4px;
 
   display: flex;