diff --git a/ionic/components/search-bar/modes/ios.scss b/ionic/components/search-bar/modes/ios.scss index 53969bd04d..ff446af8e5 100644 --- a/ionic/components/search-bar/modes/ios.scss +++ b/ionic/components/search-bar/modes/ios.scss @@ -2,18 +2,20 @@ // iOS Search Bar // -------------------------------------------------- +$search-bar-ios-padding: 0 8px !default; $search-bar-ios-background-color: rgba(0, 0, 0, 0.2) !default; $search-bar-ios-border-color: rgba(0, 0, 0, 0.05) !default; -$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-transition: all 0.3s cubic-bezier(.25, .45, .05, 1) !default; +$search-bar-ios-min-height: 44px !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-height: 28px !default; +$search-bar-ios-input-text-color: #9D9D9D !default; +$search-bar-ios-input-background-color: #FFFFFF !default; +$search-bar-ios-input-transition: all 0.3s cubic-bezier(.25, .45, .05, 1) !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; @@ -23,6 +25,7 @@ $search-bar-ios-input-close-icon-size: 17px !default; padding: $search-bar-ios-padding; background: $search-bar-ios-background-color; border-bottom: 1px solid $search-bar-ios-border-color; + min-height: $search-bar-ios-min-height; } .search-bar-search-icon { diff --git a/ionic/components/search-bar/modes/md.scss b/ionic/components/search-bar/modes/md.scss new file mode 100644 index 0000000000..4605baf186 --- /dev/null +++ b/ionic/components/search-bar/modes/md.scss @@ -0,0 +1,71 @@ + +// Material Design Search Bar +// -------------------------------------------------- + +$search-bar-md-padding: 8px !default; +$search-bar-md-background-color: inherit !default; + +$search-bar-md-input-search-icon-color: #5B5B5B !default; +$search-bar-md-input-search-icon-svg: "" !default; +$search-bar-md-input-search-icon-size: 20px !default; + +$search-bar-md-input-height: 28px !default; +$search-bar-md-input-box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12) !default; +$search-bar-md-input-placeholder-color: #AEAEAE !default; +$search-bar-md-input-text-color: #141414 !default; +$search-bar-md-input-background-color: #FFFFFF !default; +$search-bar-md-input-border-radius: 2px !default; + +$search-bar-md-input-close-icon-color: #5B5B5B !default; +$search-bar-md-input-close-icon-svg: "" !default; +$search-bar-md-input-close-icon-size: 22px !default; + + +.search-bar { + padding: $search-bar-md-padding; + background: $search-bar-md-background-color; +} + +.search-bar-search-icon { + width: $search-bar-md-input-search-icon-size + 1; + height: $search-bar-md-input-search-icon-size + 1; + + @include svg-background-image($search-bar-md-input-search-icon-svg); + background-size: $search-bar-md-input-search-icon-size; + background-repeat: no-repeat; + position: absolute; + left: 13px; + top: 13px; +} + +.search-bar-input { + padding: 8px 55px; + + height: $search-bar-md-input-height; + box-shadow: $search-bar-md-input-box-shadow; + + font-size: 1.6rem; + font-weight: 400; + + border-radius: $search-bar-md-input-border-radius; + color: $search-bar-md-input-text-color; + background-color: $search-bar-md-input-background-color; + background-repeat: no-repeat; + background-position: 8px center; + + &::placeholder { + color: $search-bar-md-input-placeholder-color; + } +} + +.search-bar-close-icon { + width: $search-bar-md-input-close-icon-size; + height: $search-bar-md-input-close-icon-size; + + @include svg-background-image($search-bar-md-input-close-icon-svg); + background-size: $search-bar-md-input-close-icon-size; + background-repeat: no-repeat; + position: absolute; + right: 13px; + top: 13px; +} diff --git a/ionic/components/search-bar/search-bar.scss b/ionic/components/search-bar/search-bar.scss index 90ab2129a5..7bff42fe48 100644 --- a/ionic/components/search-bar/search-bar.scss +++ b/ionic/components/search-bar/search-bar.scss @@ -2,15 +2,12 @@ // Search Bar // -------------------------------------------------- -$search-bar-min-height: 44px !default; - .search-bar { position: relative; display: flex; align-items: center; width: 100%; - min-height: $search-bar-min-height; } .search-bar-icon { diff --git a/ionic/components/search-bar/search-bar.ts b/ionic/components/search-bar/search-bar.ts index 5177262b39..ddd1e9b41a 100644 --- a/ionic/components/search-bar/search-bar.ts +++ b/ionic/components/search-bar/search-bar.ts @@ -6,7 +6,14 @@ import {IonicConfig} from '../../config/config'; import {IonicComponent, IonicView} from '../../config/decorators'; /** - * TODO + * @name Search Bar + * @description + * The Search Bar service adds an input field which can be used to search or filter items. + * + * @usage + * ```html + * + * ``` */ @IonicComponent({ selector: 'ion-search-bar', diff --git a/ionic/ionic.md.scss b/ionic/ionic.md.scss index 2f4dd37d40..2488864466 100644 --- a/ionic/ionic.md.scss +++ b/ionic/ionic.md.scss @@ -15,6 +15,7 @@ "components/nav-bar/modes/md", "components/popup/modes/md", "components/radio/modes/md", + "components/search-bar/modes/md", "components/switch/modes/md", "components/tabs/modes/md", "components/tap-click/ripple";