Skip to content

Commit

Permalink
fix(button): exclude solid from getting added to the button in the class
Browse files Browse the repository at this point in the history
This prevents `button-solid-secondary` from being added when it should
just be `button-secondary`.

references #6202
  • Loading branch information
brandyscarney committed Apr 27, 2016
1 parent 21f8652 commit 4252448
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ionic/components/button/button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ export class Button {
this._renderer.setElementClass(this._elementRef.nativeElement, this._role + '-' + type.toLowerCase(), assignCssClass);
}
}

/**
* @private
*/
Expand All @@ -331,7 +331,7 @@ export class Button {
// Support array to allow removal of many styles at once.
let styles = (type instanceof Array ? type : [type]);
styles.forEach(styleName => {
let colorStyle = (styleName !== null && styleName !== 'default' ? styleName.toLowerCase() + '-' : '');
let colorStyle = (styleName !== null && styleName !== 'default' && styleName !== 'solid' ? styleName.toLowerCase() + '-' : '');
this._colors.forEach(colorName => {
this._setClass(colorStyle + colorName, assignCssClass); // button-secondary, button-clear-secondary
});
Expand Down

0 comments on commit 4252448

Please sign in to comment.