From badce96a18d104001f85ec9238e94f11631bdbf8 Mon Sep 17 00:00:00 2001 From: Andrew Seguin Date: Thu, 6 Feb 2020 14:10:12 -0800 Subject: [PATCH 1/2] fix(material-experimental/mdc-button): add base css class to all buttons --- src/material-experimental/mdc-button/button-base.ts | 6 ++++++ src/material/dialog/dialog.scss | 3 ++- src/material/expansion/expansion-panel.scss | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/material-experimental/mdc-button/button-base.ts b/src/material-experimental/mdc-button/button-base.ts index b1968daf8bb1..dc66aacd70aa 100644 --- a/src/material-experimental/mdc-button/button-base.ts +++ b/src/material-experimental/mdc-button/button-base.ts @@ -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', }; @@ -148,6 +151,9 @@ export const MAT_ANCHOR_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', }; diff --git a/src/material/dialog/dialog.scss b/src/material/dialog/dialog.scss index 6686504d1c80..1751801dc466 100644 --- a/src/material/dialog/dialog.scss +++ b/src/material/dialog/dialog.scss @@ -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'] & { diff --git a/src/material/expansion/expansion-panel.scss b/src/material/expansion/expansion-panel.scss index 45b5866912ff..46e4830fb38d 100644 --- a/src/material/expansion/expansion-panel.scss +++ b/src/material/expansion/expansion-panel.scss @@ -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'] & { From 44672af183ea67282d03b0244c896bf693c94150 Mon Sep 17 00:00:00 2001 From: Andrew Seguin Date: Thu, 20 Feb 2020 11:49:53 -0800 Subject: [PATCH 2/2] retry --- src/material-experimental/mdc-button/button-base.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/material-experimental/mdc-button/button-base.ts b/src/material-experimental/mdc-button/button-base.ts index dc66aacd70aa..b3e5ce8f9d2c 100644 --- a/src/material-experimental/mdc-button/button-base.ts +++ b/src/material-experimental/mdc-button/button-base.ts @@ -151,10 +151,10 @@ export const MAT_ANCHOR_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', + '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', - 'class': 'mat-mdc-focus-indicator', }; /**