Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(button): allow for non-colored flat button #12550

Merged
merged 1 commit into from
Aug 7, 2018
Merged

fix(button): allow for non-colored flat button #12550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/lib/button/button.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
/** Default color palette for round buttons (mat-fab and mat-mini-fab) */
const DEFAULT_ROUND_BUTTON_COLOR = 'accent';

/** Default color palette for flat buttons (mat-flat-button) */
const DEFAULT_FLAT_BUTTON_COLOR = 'primary';

/**
* List of classes to add to MatButton instances based on host attributes to
* style as different variants.
Expand Down Expand Up @@ -113,8 +110,6 @@ export class MatButton extends _MatButtonMixinBase

if (this.isRoundButton) {
this.color = DEFAULT_ROUND_BUTTON_COLOR;
} else if (this._hasHostAttributes('mat-flat-button')) {
this.color = DEFAULT_FLAT_BUTTON_COLOR;
}
}

Expand Down