From 1f2e29b16c4083f83dadd5a04d796dc31dff8a4d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 31 Mar 2015 10:11:14 -0500
Subject: [PATCH] toolbar updates

---
 .../toolbar/extensions/android.scss           | 18 +++---------
 src/components/toolbar/extensions/ios.scss    | 29 ++++++++++++++-----
 src/components/toolbar/toolbar.scss           | 19 +++++++-----
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/components/toolbar/extensions/android.scss b/src/components/toolbar/extensions/android.scss
index eb3772584e..d14aed61c0 100644
--- a/src/components/toolbar/extensions/android.scss
+++ b/src/components/toolbar/extensions/android.scss
@@ -7,33 +7,23 @@ $toolbar-android-background:              #f7f7f8 !default;
 
 $toolbar-android-title-font-size:         1.7rem !default;
 $toolbar-android-button-font-size:        1.7rem !default;
-$toolbar-android-button-color:            #007aff !default;
+$toolbar-android-button-text-color:       #007aff !default;
 
 
 .toolbar-android {
   height: $toolbar-android-height;
   background: $toolbar-android-background;
 
-  .bar-spacer {
-    @include flex(none);
-  }
-
-  .bar-title {
-    position: static;
-    margin: 0;
-    text-align: left;
-  }
-
   .button {
     font-size: $toolbar-android-button-font-size;
-    color: $toolbar-android-button-color;
+    color: $toolbar-android-button-text-color;
     border: none;
+
     padding: 0;
     margin: 0 10px;
+
     min-height: $toolbar-android-height;
     min-width: 0;
-    background: transparent;
   }
 
 }
-
diff --git a/src/components/toolbar/extensions/ios.scss b/src/components/toolbar/extensions/ios.scss
index c13bdda19f..099a1d57e8 100644
--- a/src/components/toolbar/extensions/ios.scss
+++ b/src/components/toolbar/extensions/ios.scss
@@ -2,13 +2,14 @@
 // iOS Toolbar
 // --------------------------------------------------
 
-$toolbar-ios-height:                  4.4rem !default;
-$toolbar-ios-background:              #f7f7f8 !default;
-$toolbar-ios-border-color:            #c4c4c4 !default;
+$toolbar-ios-height:                        4.4rem !default;
+$toolbar-ios-background:                    #f7f7f8 !default;
+$toolbar-ios-border-color:                  #c4c4c4 !default;
 
-$toolbar-ios-title-font-size:         1.7rem !default;
-$toolbar-ios-button-font-size:        1.7rem !default;
-$toolbar-ios-button-color:            #007aff !default;
+$toolbar-ios-title-font-size:               1.7rem !default;
+$toolbar-ios-button-font-size:              1.7rem !default;
+$toolbar-ios-button-text-color:                  #007aff !default;
+$toolbar-ios-button-background-color:       transparent !default;
 
 
 .toolbar-ios {
@@ -34,21 +35,33 @@ $toolbar-ios-button-color:            #007aff !default;
     content: '';
   }
 
+  .bar-title {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+  }
+
   .bar-inner-title {
     font-size: $toolbar-ios-title-font-size;
     text-align: center;
     opacity: 0;
   }
 
+  .bar-spacer {
+    @include flex(1);
+  }
+
   .button {
     font-size: $toolbar-ios-button-font-size;
-    color: $toolbar-ios-button-color;
+    color: $toolbar-ios-button-text-color;
     border: none;
     padding: 0;
     margin: 0 10px;
     min-height: $toolbar-ios-height;
     min-width: 0;
-    background: transparent;
+    background: $toolbar-ios-button-background-color;
   }
 
 }
diff --git a/src/components/toolbar/toolbar.scss b/src/components/toolbar/toolbar.scss
index 8f71c9ff8f..2fa244e2b7 100644
--- a/src/components/toolbar/toolbar.scss
+++ b/src/components/toolbar/toolbar.scss
@@ -2,12 +2,16 @@
 // Toolbar
 // --------------------------------------------------
 
+$toolbar-background:              #f7f7f8 !default;
+
+
 .toolbar {
   position: relative;
   @include flex-display();
   @include flex-direction(row);
   @include flex-align-items(center);
   @include flex-justify-content(space-between);
+  background: $toolbar-background;
 }
 
 .bar-top {
@@ -30,13 +34,11 @@
   @include flex-align-items(center);
 }
 
-.bar-title {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
+.bar-spacer {
+  @include flex(none);
+}
 
+.bar-title {
   @include flex-display();
   @include flex(1);
   @include flex-align-items(center);
@@ -57,6 +59,7 @@
   }
 }
 
-.bar-spacer {
-  @include flex(1);
+.toolbar .button {
+  background: transparent;
+  border: none;
 }