Skip to content

Commit bd4c6fb

Browse files
committed
Fix lint and formatting issues
1 parent 8580d97 commit bd4c6fb

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

src/material/button/button.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,10 @@ $fallbacks: m3-button.get-tokens();
135135
}
136136

137137
.mat-mdc-button-progress-indicator-container {
138-
@include progress-spinner-theme.overrides((active-indicator-color: token-utils.slot(button-filled-progress-active-indicator-color,
139-
$fallbacks ),
140-
));
138+
@include progress-spinner-theme.overrides(
139+
(active-indicator-color: token-utils.slot(
140+
button-filled-progress-active-indicator-color, $fallbacks))
141+
);
141142
}
142143

143144
// We need to re-apply the disabled tokens since MDC uses
@@ -348,10 +349,9 @@ $fallbacks: m3-button.get-tokens();
348349
}
349350

350351
.mat-mdc-button-progress-indicator-shown {
351-
.material-icons,
352352
mat-icon,
353353
[matButtonIcon],
354354
.mdc-button__label {
355355
visibility: hidden;
356356
}
357-
}
357+
}

src/material/button/fab.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ $fallbacks: m3-fab.get-tokens();
242242
}
243243

244244
.mat-mdc-button-progress-indicator-shown {
245-
.material-icons,
246245
mat-icon,
247246
[matButtonIcon],
248247
.mdc-button__label {

src/material/button/icon-button.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ $fallbacks: m3-icon-button.get-tokens();
103103
}
104104

105105
.mat-mdc-button-progress-indicator-shown {
106-
.material-icons,
107106
mat-icon {
108107
visibility: hidden;
109108
}

src/material/button/testing/button-harness.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class MatButtonHarness extends ContentContainerComponentHarness {
6666
});
6767
}
6868

69-
private readonly progressIndicator = this.locatorForOptional('[progressIndicator]');
69+
private readonly _progressIndicator = this.locatorForOptional('[progressIndicator]');
7070

7171
/**
7272
* Clicks the button at the given position relative to its top-left.
@@ -113,7 +113,7 @@ export class MatButtonHarness extends ContentContainerComponentHarness {
113113

114114
/** Whether the button is showing a progress indicator. */
115115
async isShowingProgress(): Promise<boolean> {
116-
return (await this.progressIndicator()) !== null;
116+
return (await this._progressIndicator()) !== null;
117117
}
118118

119119
/** Gets the variant of the button. */

0 commit comments

Comments
 (0)