diff --git a/ionic/components/search-bar/modes/ios.scss b/ionic/components/search-bar/modes/ios.scss index 9227c78f88..53969bd04d 100644 --- a/ionic/components/search-bar/modes/ios.scss +++ b/ionic/components/search-bar/modes/ios.scss @@ -8,9 +8,16 @@ $search-bar-ios-padding: 0 8px !default; $search-bar-ios-input-height: 28px !default; $search-bar-ios-input-text-color: #9D9D9D !default; $search-bar-ios-input-background-color: #FFFFFF !default; -$search-bar-ios-input-icon-color: #767676 !default; -$search-bar-ios-input-background-svg: "" !default; -$search-bar-ios-background-size: 13px 13px !default; +$search-bar-ios-input-transition: all 0.3s cubic-bezier(.25, .45, .05, 1) !default; + +$search-bar-ios-input-search-icon-color: #767676 !default; +$search-bar-ios-input-search-icon-svg: "" !default; +$search-bar-ios-input-search-icon-size: 13px !default; + +$search-bar-ios-input-close-icon-color: #8F8E94 !default; +$search-bar-ios-input-close-icon-svg: "" !default; +$search-bar-ios-input-close-icon-size: 17px !default; + .search-bar { padding: $search-bar-ios-padding; @@ -18,14 +25,15 @@ $search-bar-ios-background-size: 13px 13px !default; border-bottom: 1px solid $search-bar-ios-border-color; } -.search-bar-icon { - width: 100%; - height: 13px; +.search-bar-search-icon { + width: $search-bar-ios-input-search-icon-size + 1; + height: $search-bar-ios-input-search-icon-size + 1; - transform: translateX(calc(50% - 60px)); + transform: translateX(calc(50% + 90px)); + transition: $search-bar-ios-input-transition; - @include svg-background-image($search-bar-ios-input-background-svg); - background-size: $search-bar-ios-background-size; + @include svg-background-image($search-bar-ios-input-search-icon-svg); + background-size: $search-bar-ios-input-search-icon-size; background-repeat: no-repeat; position: absolute; left: 10px; @@ -45,21 +53,31 @@ $search-bar-ios-background-size: 13px 13px !default; background-repeat: no-repeat; background-position: 8px center; + transition: $search-bar-ios-input-transition; + @include calc(padding-left, "50% - 28px"); } +.search-bar-close-icon { + width: $search-bar-ios-input-close-icon-size; + height: $search-bar-ios-input-close-icon-size; + @include svg-background-image($search-bar-ios-input-close-icon-svg); + background-size: $search-bar-ios-input-close-icon-size; + background-repeat: no-repeat; + position: absolute; + right: 10px; + top: 6px; +} .search-bar-input-container.left-align { - .search-bar-icon { + .search-bar-search-icon { transform: translateX(0); - -webkit-transition: all 0.3s cubic-bezier(.25, .45, .05, 1); - -moz-transition: all 0.3s cubic-bezier(.25, .45, .05, 1); + transition: $search-bar-ios-input-transition; } .search-bar-input { padding-left: 28px; - -webkit-transition: all 0.3s cubic-bezier(.25, .45, .05, 1); - -moz-transition: all 0.3s cubic-bezier(.25, .45, .05, 1); + transition: $search-bar-ios-input-transition; } } diff --git a/ionic/components/search-bar/search-bar.ts b/ionic/components/search-bar/search-bar.ts index cc9bf98a6a..5177262b39 100644 --- a/ionic/components/search-bar/search-bar.ts +++ b/ionic/components/search-bar/search-bar.ts @@ -23,7 +23,7 @@ import {IonicComponent, IonicView} from '../../config/decorators'; @IonicView({ template: `
-
+