Skip to content

fix(material-experimental/mdc-button): add base css class to all buttons #18422

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

Merged
merged 2 commits into from
Feb 26, 2020
Merged

fix(material-experimental/mdc-button): add base css class to all buttons #18422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
badce96
fix(material-experimental/mdc-button): add base css class to all buttons
andrewseguin Feb 6, 2020
44672af
retry
andrewseguin Feb 20, 2020
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
6 changes: 6 additions & 0 deletions src/material-experimental/mdc-button/button-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ export const MAT_BUTTON_HOST = {
// an unthemed version. If color is undefined, apply a CSS class that makes it easy to
// select and style this "theme".
'[class.mat-unthemed]': '!color',
// Add a class that applies to all buttons. This makes it easier to target if somebody
// wants to target all Material buttons.
'[class.mat-mdc-button-base]': 'true',
'class': 'mat-mdc-focus-indicator',
};

Expand Down Expand Up @@ -149,6 +152,9 @@ export const MAT_ANCHOR_HOST = {
// select and style this "theme".
'[class.mat-unthemed]': '!color',
'class': 'mat-mdc-focus-indicator',
// Add a class that applies to all buttons. This makes it easier to target if somebody
// wants to target all Material buttons.
'[class.mat-mdc-button-base]': 'true',
};

/**
Expand Down
3 changes: 2 additions & 1 deletion src/material/dialog/dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ $mat-dialog-button-margin: 8px !default;
justify-content: center;
}

.mat-button-base + .mat-button-base {
.mat-button-base + .mat-button-base,
.mat-mdc-button-base + .mat-mdc-button-base {
margin-left: $mat-dialog-button-margin;

[dir='rtl'] & {
Expand Down
2 changes: 1 addition & 1 deletion src/material/expansion/expansion-panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
justify-content: flex-end;
padding: 16px 8px 16px 24px;

button.mat-button-base {
button.mat-button-base, button.mat-mdc-button-base {
margin-left: 8px;

[dir='rtl'] & {
Expand Down