-
Notifications
You must be signed in to change notification settings - Fork 13.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(searchbar): looks good when mode is different
references #8855
- Loading branch information
1 parent
cd0e19a
commit 0c0f32d
Showing
2 changed files
with
9 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,8 +30,8 @@ import { Debouncer } from '../../util/debouncer'; | |
selector: 'ion-searchbar', | ||
template: | ||
'<div class="searchbar-input-container">' + | ||
'<button ion-button (click)="cancelSearchbar($event)" (mousedown)="cancelSearchbar($event)" clear color="dark" class="searchbar-md-cancel" type="button">' + | ||
'<ion-icon name="arrow-back"></ion-icon>' + | ||
'<button ion-button mode="md" (click)="cancelSearchbar($event)" (mousedown)="cancelSearchbar($event)" clear color="dark" class="searchbar-md-cancel" type="button">' + | ||
'<ion-icon name="md-arrow-back"></ion-icon>' + | ||
'</button>' + | ||
'<div #searchbarIcon class="searchbar-search-icon"></div>' + | ||
'<input #searchbarInput class="searchbar-input" (input)="inputChanged($event)" (blur)="inputBlurred($event)" (focus)="inputFocused($event)" ' + | ||
|
@@ -40,9 +40,9 @@ import { Debouncer } from '../../util/debouncer'; | |
'[attr.autocomplete]="_autocomplete" ' + | ||
'[attr.autocorrect]="_autocorrect" ' + | ||
'[attr.spellcheck]="_spellcheck">' + | ||
'<button ion-button clear class="searchbar-clear-icon" (click)="clearInput($event)" (mousedown)="clearInput($event)" type="button"></button>' + | ||
'<button ion-button clear class="searchbar-clear-icon" [mode]="_mode" (click)="clearInput($event)" (mousedown)="clearInput($event)" type="button"></button>' + | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
manucorporat
Author
Contributor
|
||
'</div>' + | ||
'<button ion-button #cancelButton [tabindex]="_isActive ? 1 : -1" clear (click)="cancelSearchbar($event)" (mousedown)="cancelSearchbar($event)" class="searchbar-ios-cancel" type="button">{{cancelButtonText}}</button>', | ||
'<button ion-button #cancelButton mode="ios" [tabindex]="_isActive ? 1 : -1" clear (click)="cancelSearchbar($event)" (mousedown)="cancelSearchbar($event)" class="searchbar-ios-cancel" type="button">{{cancelButtonText}}</button>', | ||
host: { | ||
'[class.searchbar-animated]': 'animated', | ||
'[class.searchbar-has-value]': '_value', | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 comment
on commit 0c0f32d
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good changes 😉 thanks @manucorporat
I think that this should be applyed in more components propagate the mode.
Ex: Fab, RadioButton
Later make tests