From 5f55f9b4ad758422786012d2db6175d089602e78 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Tue, 8 Dec 2015 12:54:20 -0500
Subject: [PATCH] fix(searchbar): iOS fixed searchbar cancel button color in a
 toolbar

references #289
---
 ionic/components/searchbar/modes/ios.scss         | 7 ++++++-
 ionic/components/searchbar/test/toolbar/e2e.ts    | 4 ++++
 ionic/components/searchbar/test/toolbar/index.ts  | 3 ---
 ionic/components/searchbar/test/toolbar/main.html | 5 +++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ionic/components/searchbar/modes/ios.scss b/ionic/components/searchbar/modes/ios.scss
index 9a0b2965cc..c1509f0e6f 100644
--- a/ionic/components/searchbar/modes/ios.scss
+++ b/ionic/components/searchbar/modes/ios.scss
@@ -177,10 +177,15 @@ ion-searchbar {
 @each $color-name, $color-value in $colors-ios {
 
   ion-searchbar[#{$color-name}] {
-
     .searchbar-ios-cancel {
       color: $color-value;
     }
   }
 
+  .toolbar[#{$color-name}] ion-searchbar {
+    .searchbar-ios-cancel {
+      color: inverse($color-value);
+    }
+  }
+
 }
diff --git a/ionic/components/searchbar/test/toolbar/e2e.ts b/ionic/components/searchbar/test/toolbar/e2e.ts
index 375fb57626..7d8a311063 100644
--- a/ionic/components/searchbar/test/toolbar/e2e.ts
+++ b/ionic/components/searchbar/test/toolbar/e2e.ts
@@ -10,3 +10,7 @@ it('primary should focus', function() {
 it('danger should focus', function() {
   element(by.css('.e2eDangerToolbarSearchbar input')).sendKeys("CC");
 });
+
+it('light should focus', function() {
+  element(by.css('.e2eLightToolbarSearchbar input')).sendKeys("DD");
+});
diff --git a/ionic/components/searchbar/test/toolbar/index.ts b/ionic/components/searchbar/test/toolbar/index.ts
index c81eb2b477..bf5a6c4b9d 100644
--- a/ionic/components/searchbar/test/toolbar/index.ts
+++ b/ionic/components/searchbar/test/toolbar/index.ts
@@ -7,9 +7,6 @@ import {SearchPipe} from 'ionic/components/searchbar/searchbar';
   templateUrl: 'main.html'
 })
 class E2EApp {
-  DefaultToolbarSearch: string;
-  PrimaryToolbarSearch: string;
-  DangerToolbarSearch: string;
 
   constructor() {
 
diff --git a/ionic/components/searchbar/test/toolbar/main.html b/ionic/components/searchbar/test/toolbar/main.html
index 8af9afce60..b50f292116 100644
--- a/ionic/components/searchbar/test/toolbar/main.html
+++ b/ionic/components/searchbar/test/toolbar/main.html
@@ -18,4 +18,9 @@
     <ion-searchbar [(ng-model)]="dangerToolbarSearch" show-cancel="true" class="e2eDangerToolbarSearchbar"></ion-searchbar>
   </ion-toolbar>
 
+  <h5 padding-left padding-top> Search - Light Toolbar </h5>
+  <ion-toolbar light>
+    <ion-searchbar [(ng-model)]="lightToolbarSearch" show-cancel="true" class="e2eLightToolbarSearchbar"></ion-searchbar>
+  </ion-toolbar>
+
 </ion-content>