From ba4e117e558736c9c0ab50e8dc4207dcca470a14 Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
Date: Tue, 12 Feb 2019 13:25:29 -0500
Subject: [PATCH] fix(searchbar): allow setting of toolbar color and searchbar
 color (#17474)

* fix(searchbar): allow setting of toolbar color and searchbar color

* fix test label typo
---
 core/src/components/searchbar/searchbar.ios.scss      | 10 +++++-----
 core/src/components/searchbar/test/toolbar/index.html |  7 ++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/src/components/searchbar/searchbar.ios.scss b/core/src/components/searchbar/searchbar.ios.scss
index 4fd7f2643c..4d2cbba2ee 100644
--- a/core/src/components/searchbar/searchbar.ios.scss
+++ b/core/src/components/searchbar/searchbar.ios.scss
@@ -156,11 +156,11 @@
 // Searchbar in Toolbar Color
 // -----------------------------------------
 
-:host-context(ion-toolbar.ion-color) {
+:host-context(ion-toolbar.ion-color):not(.ion-color) {
   color: inherit;
 }
 
-:host-context(ion-toolbar.ion-color) .searchbar-cancel-button {
+:host-context(ion-toolbar.ion-color):not(.ion-color) .searchbar-cancel-button {
   color: currentColor;
 }
 
@@ -170,13 +170,13 @@
   opacity: $searchbar-ios-input-icon-opacity;
 }
 
-:host-context(ion-toolbar.ion-color) .searchbar-input {
+:host-context(ion-toolbar.ion-color):not(.ion-color) .searchbar-input {
   background: rgba(var(--ion-color-contrast-rgb), $searchbar-ios-input-background-color-alpha);
   color: currentColor;
 }
 
-:host-context(ion-toolbar.ion-color) .searchbar-clear-button {
+:host-context(ion-toolbar.ion-color):not(.ion-color) .searchbar-clear-button {
   color: currentColor;
 
   opacity: $searchbar-ios-input-icon-opacity;
-}
+}
\ No newline at end of file
diff --git a/core/src/components/searchbar/test/toolbar/index.html b/core/src/components/searchbar/test/toolbar/index.html
index 624fd9c3f6..177e86ce41 100644
--- a/core/src/components/searchbar/test/toolbar/index.html
+++ b/core/src/components/searchbar/test/toolbar/index.html
@@ -78,6 +78,11 @@
         <ion-toolbar color="dark">
           <ion-searchbar show-cancel-button placeholder="Filter Schedules"></ion-searchbar>
         </ion-toolbar>
+        
+        <h5 padding-start padding-top> Search - Dark Toolbar, Primary Search </h5>
+        <ion-toolbar color="dark">
+          <ion-searchbar show-cancel-button color="primary" placeholder="Filter Schedules"></ion-searchbar>
+        </ion-toolbar>
 
         <ion-grid>
           <ion-row>
@@ -138,4 +143,4 @@
   </style>
 </body>
 
-</html>
+</html>
\ No newline at end of file