From d0385aa95dddf401e98268290e0b198bad0a24d3 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Tue, 3 Nov 2015 17:04:26 -0500
Subject: [PATCH] refactor(searchbar): UI fixes for searchbar, added clear
 input to the default cancel action

references #247
---
 ionic/components/searchbar/modes/ios.scss |  9 +++--
 ionic/components/searchbar/modes/md.scss  | 41 ++++++++++++++---------
 ionic/components/searchbar/searchbar.ts   |  2 +-
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/ionic/components/searchbar/modes/ios.scss b/ionic/components/searchbar/modes/ios.scss
index 44703b3291..651fa26576 100644
--- a/ionic/components/searchbar/modes/ios.scss
+++ b/ionic/components/searchbar/modes/ios.scss
@@ -38,7 +38,7 @@ ion-searchbar {
   background-size: $searchbar-ios-input-search-icon-size;
   background-repeat: no-repeat;
   position: absolute;
-  left: 10px;
+  left: 9px;
   top: 9px;
 
   @include calc(margin-left, "50% - 60px");
@@ -92,8 +92,7 @@ ion-searchbar.left-align {
     margin-left: 0;
   }
   .searchbar-input {
-    padding-left: 28px;
-    background-position: 8px;
+    padding-left: 30px;
   }
 }
 
@@ -117,7 +116,7 @@ ion-searchbar.left-align {
     }
   }
 
-  .left-align .searchbar-cancel {
+  .focused .searchbar-cancel {
     right: 0px;
   }
 
@@ -133,10 +132,10 @@ ion-searchbar.left-align {
 @each $color, $value in $colors {
 
   ion-searchbar[#{$color}] {
-    //background-color: $value;
 
     .searchbar-cancel {
       color: $value;
     }
+    
   }
 }
diff --git a/ionic/components/searchbar/modes/md.scss b/ionic/components/searchbar/modes/md.scss
index ae431fc0e7..ba05cdd34c 100644
--- a/ionic/components/searchbar/modes/md.scss
+++ b/ionic/components/searchbar/modes/md.scss
@@ -25,10 +25,6 @@ ion-searchbar {
   background: $searchbar-md-background-color;
 }
 
-.toolbar ion-searchbar {
-  padding: 3px;
-}
-
 .searchbar-search-icon,
 .searchbar-cancel-icon {
   width: $searchbar-md-input-search-icon-size + 1;
@@ -53,18 +49,6 @@ ion-searchbar {
   left: 10px;
 }
 
-.focused {
-
-  .searchbar-search-icon {
-    display: none;
-  }
-
-  .searchbar-cancel-icon {
-    display: inline-flex;
-  }
-
-}
-
 .searchbar-input {
   padding: 6px 55px;
 
@@ -99,3 +83,28 @@ ion-searchbar {
 .searchbar-cancel {
   display: none;
 }
+
+.focused {
+
+  .searchbar-search-icon {
+    display: none;
+  }
+
+  .searchbar-cancel-icon {
+    display: inline-flex;
+  }
+
+}
+
+.toolbar {
+
+  ion-searchbar {
+    padding: 3px;
+  }
+
+  .searchbar-cancel-icon {
+    left: 14px;
+  }
+
+
+}
diff --git a/ionic/components/searchbar/searchbar.ts b/ionic/components/searchbar/searchbar.ts
index dbb3987777..14db8d919b 100644
--- a/ionic/components/searchbar/searchbar.ts
+++ b/ionic/components/searchbar/searchbar.ts
@@ -22,9 +22,9 @@ import {Icon} from '../icon/icon';
     'cancelText': 'Cancel',
     'placeholder': 'Search',
     'cancelAction': function(event, query) {
-      console.log('Default Cancel');
       this.element = this.elementRef.nativeElement.querySelector('input');
       this.element.blur();
+      this.clearInput();
     }
   },
   host: {