From 901508e035dfe0bb076ab358b35c3a09edfe870f Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Thu, 10 Dec 2015 11:02:38 -0500
Subject: [PATCH] fix(toolbar/tabs): change toolbar-background to use the
 background property

Renamed Sass variables for toolbar and tabbar to use just background,
not color. Closes #716
---
 ionic/components/tabs/tabs.ios.scss       | 4 ++--
 ionic/components/tabs/tabs.md.scss        | 4 ++--
 ionic/components/toolbar/toolbar.ios.scss | 4 ++--
 ionic/components/toolbar/toolbar.md.scss  | 6 +++---
 ionic/themes/default.ios.scss             | 2 +-
 ionic/themes/default.md.scss              | 2 +-
 ionic/themes/default.scss                 | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ionic/components/tabs/tabs.ios.scss b/ionic/components/tabs/tabs.ios.scss
index 2bef12965b..968f8db08c 100644
--- a/ionic/components/tabs/tabs.ios.scss
+++ b/ionic/components/tabs/tabs.ios.scss
@@ -4,7 +4,7 @@
 // iOS Tabs
 // --------------------------------------------------
 
-$tabbar-ios-background-color:         $toolbar-ios-background-color !default;
+$tabbar-ios-background:               $toolbar-ios-background !default;
 $tabbar-ios-item-padding:             0px 10px !default;
 $tabbar-ios-item-font-size:           10px !default;
 $tabbar-ios-item-icon-size:           32px !default;
@@ -18,7 +18,7 @@ $tab-button-ios-inactive-color:       $toolbar-ios-inactive-color !default;
 
 tabbar {
   border-top: 1px solid $toolbar-ios-border-color;
-  background: $tabbar-ios-background-color;
+  background: $tabbar-ios-background;
 }
 
 ion-tabs[tabbar-placement=top] tabbar {
diff --git a/ionic/components/tabs/tabs.md.scss b/ionic/components/tabs/tabs.md.scss
index 96345c83c3..3273111a2e 100644
--- a/ionic/components/tabs/tabs.md.scss
+++ b/ionic/components/tabs/tabs.md.scss
@@ -4,7 +4,7 @@
 // Material Design Tabs
 // --------------------------------------------------
 
-$tabbar-md-background-color:         $toolbar-md-background-color !default;
+$tabbar-md-background:               $toolbar-md-background !default;
 $tabbar-md-item-padding:             12px 10px 5px 10px !default;
 $tabbar-md-item-font-size:           1.4rem !default;
 $tabbar-md-item-font-weight:         500 !default;
@@ -16,7 +16,7 @@ $tab-button-md-inactive-color:       $toolbar-md-inactive-color !default;
 
 
 tabbar {
-  background: $tabbar-md-background-color;
+  background: $tabbar-md-background;
 }
 
 
diff --git a/ionic/components/toolbar/toolbar.ios.scss b/ionic/components/toolbar/toolbar.ios.scss
index 917df9c13b..aeb02bad95 100644
--- a/ionic/components/toolbar/toolbar.ios.scss
+++ b/ionic/components/toolbar/toolbar.ios.scss
@@ -43,7 +43,7 @@ ion-navbar-section {
   border-bottom-width: 1px;
   border-bottom-style: solid;
   border-color: $toolbar-ios-border-color;
-  background-color: $toolbar-ios-background-color;
+  background: $toolbar-ios-background;
 }
 
 &.hairlines .toolbar-background {
@@ -82,7 +82,7 @@ ion-title {
   .toolbar[#{$color-name}] {
 
     .toolbar-background {
-      background-color: $color-value;
+      background: $color-value;
       border-color: darken($color-value, 10%);
     }
 
diff --git a/ionic/components/toolbar/toolbar.md.scss b/ionic/components/toolbar/toolbar.md.scss
index 8dbccb52e2..311c62ad7c 100644
--- a/ionic/components/toolbar/toolbar.md.scss
+++ b/ionic/components/toolbar/toolbar.md.scss
@@ -41,7 +41,7 @@ ion-navbar-section {
 
 .toolbar-background {
   border-color: $toolbar-md-border-color;
-  background-color: $toolbar-md-background-color;
+  background: $toolbar-md-background;
 }
 
 
@@ -67,7 +67,7 @@ ion-title {
   .toolbar[#{$color-name}] {
 
     .toolbar-background {
-      background-color: $color-value;
+      background: $color-value;
     }
 
     .toolbar-title,
@@ -112,7 +112,7 @@ ion-buttons[right] {
   margin-top: 0;
   margin-bottom: 0;
   margin-left: 0.2rem;
-  margin-right: 0.2rem;  
+  margin-right: 0.2rem;
   padding: 0 5px;
   min-height: 32px;
   border: 0;
diff --git a/ionic/themes/default.ios.scss b/ionic/themes/default.ios.scss
index edd773e3d0..90e344a758 100644
--- a/ionic/themes/default.ios.scss
+++ b/ionic/themes/default.ios.scss
@@ -26,7 +26,7 @@ $font-size-ios-base:                   $font-size-base !default;
 // iOS Toolbar
 // --------------------------------------------------
 
-$toolbar-ios-background-color:         $toolbar-background-color !default;
+$toolbar-ios-background:               $toolbar-background !default;
 $toolbar-ios-border-color:             $toolbar-border-color !default;
 $toolbar-ios-text-color:               $toolbar-text-color !default;
 $toolbar-ios-active-color:             $toolbar-active-color !default;
diff --git a/ionic/themes/default.md.scss b/ionic/themes/default.md.scss
index 69e90ae815..6e87c73754 100644
--- a/ionic/themes/default.md.scss
+++ b/ionic/themes/default.md.scss
@@ -26,7 +26,7 @@ $font-size-md-base:                   $font-size-base !default;
 // Material Design Toolbar
 // --------------------------------------------------
 
-$toolbar-md-background-color:         $toolbar-background-color !default;
+$toolbar-md-background:               $toolbar-background !default;
 $toolbar-md-border-color:             $toolbar-border-color !default;
 $toolbar-md-text-color:               $toolbar-text-color !default;
 $toolbar-md-active-color:             $toolbar-active-color !default;
diff --git a/ionic/themes/default.scss b/ionic/themes/default.scss
index a52038af9f..f2ce893d64 100644
--- a/ionic/themes/default.scss
+++ b/ionic/themes/default.scss
@@ -21,7 +21,7 @@ $subdued-text-color:         #666 !default;
 $font-family-base:           -apple-system, "Helvetica Neue", "Roboto", sans-serif !default;
 $font-size-base:             1.4rem !default; // 1.4rem == 14px
 
-$toolbar-background-color:   #f8f8f8 !default;
+$toolbar-background:         #f8f8f8 !default;
 $toolbar-border-color:       #b2b2b2 !default;
 $toolbar-text-color:         $text-color !default;
 $toolbar-active-color:       $link-color !default;