fix bad stylelint fix

mmalerba · mmalerba · commit eae5e47e9817 · 2023-08-24T22:58:26.000Z
diff --git a/src/material/card/_card-theme.scss b/src/material/card/_card-theme.scss
@@ -24,7 +24,7 @@
   }
 }
 
-@mixin color($config-or-theme) {
+@mixin color($theme) {
   @if inspection.get-theme-version($theme) == 1 {
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
   }
@@ -50,7 +50,7 @@
   }
 }
 
-@mixin typography($config-or-theme) {
+@mixin typography($theme) {
   @if inspection.get-theme-version($theme) == 1 {
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
   }
@@ -69,7 +69,7 @@
   }
 }
 
-@mixin density($config-or-theme) {
+@mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
   }
diff --git a/src/material/checkbox/_checkbox-theme.scss b/src/material/checkbox/_checkbox-theme.scss
@@ -8,7 +8,7 @@
 @use '../core/mdc-helpers/mdc-helpers';
 @use '../core/tokens/m2/mdc/checkbox' as tokens-mdc-checkbox;
 
-@mixin base($config-or-theme) {
+@mixin base($theme) {
   @if inspection.get-theme-version($config-or-theme) == 1 {
     @include _theme-from-tokens(inspection.get-theme-tokens($config-or-theme, base));
   }
@@ -19,7 +19,7 @@
   }
 }
 
-@mixin color($config-or-theme) {
+@mixin color($theme) {
   $config: theming.get-color-config($config-or-theme);
 
   @if inspection.get-theme-version($config-or-theme) == 1 {
@@ -58,7 +58,7 @@
   }
 }
 
-@mixin typography($config-or-theme) {
+@mixin typography($theme) {
   $config: typography.private-typography-to-2018-config(
           theming.get-typography-config($config-or-theme));
 
@@ -79,7 +79,7 @@
   }
 }
 
-@mixin density($config-or-theme) {
+@mixin density($theme) {
   $density-scale: theming.get-density-config($config-or-theme);
 
   @if inspection.get-theme-version($config-or-theme) == 1 {
diff --git a/src/material/core/_core-theme.scss b/src/material/core/_core-theme.scss
@@ -8,7 +8,7 @@
 @use './style/elevation';
 @use './typography/typography';
 
-@mixin color($config-or-theme) {
+@mixin color($theme) {
   @include ripple-theme.color($theme);
   @include option-theme.color($theme);
   @include optgroup-theme.color($theme);
@@ -42,15 +42,15 @@
   }
 }
 
-@mixin typography($config-or-theme) {
+@mixin typography($theme) {
   @include option-theme.typography($theme);
   @include optgroup-theme.typography($theme);
   @include pseudo-checkbox-theme.typography($theme);
   // TODO(mmalerba): add typography mixin for this.
   // @include ripple-theme.typography($config);
 }
 
-@mixin density($config-or-theme) {
+@mixin density($theme) {
   @include option-theme.density($theme);
   @include optgroup-theme.density($theme);
   // TODO(mmalerba): add density mixins for these.
diff --git a/src/material/core/option/_optgroup-theme.scss b/src/material/core/option/_optgroup-theme.scss
@@ -6,21 +6,21 @@
 @use '../theming/inspection';
 @use '../typography/typography';
 
-@mixin color($config-or-theme) {
+@mixin color($theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-optgroup.$prefix,
       tokens-mat-optgroup.get-color-tokens($theme));
   }
 }
 
-@mixin typography($config-or-theme) {
+@mixin typography($theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-optgroup.$prefix,
       tokens-mat-optgroup.get-typography-tokens($theme));
   }
 }
 
-@mixin density($config-or-theme) {
+@mixin density($theme) {
 }
 
 @mixin theme($theme-or-color-config) {
diff --git a/src/material/core/option/_option-theme.scss b/src/material/core/option/_option-theme.scss
@@ -6,7 +6,7 @@
 @use '../theming/inspection';
 @use '../typography/typography';
 
-@mixin color($config-or-theme) {
+@mixin color($theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-option.$prefix,
       tokens-mat-option.get-color-tokens($theme));
@@ -23,14 +23,14 @@
   }
 }
 
-@mixin typography($config-or-theme) {
+@mixin typography($theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-option.$prefix,
       tokens-mat-option.get-typography-tokens($theme));
   }
 }
 
-@mixin density($config-or-theme) {
+@mixin density($theme) {
 }
 
 @mixin theme($theme-or-color-config) {
diff --git a/src/material/core/ripple/_ripple-theme.scss b/src/material/core/ripple/_ripple-theme.scss
@@ -3,7 +3,7 @@
 @use '../theming/inspection';
 
 // Colors for the ripple elements.
-@mixin color($config-or-theme) {
+@mixin color($theme) {
   $foreground-base: inspection.get-theme-color($theme, foreground, base);
   $color-opacity: 0.1;
 
@@ -23,7 +23,6 @@
 @mixin theme($theme-or-color-config) {
   $theme: theming.private-legacy-get-theme($theme-or-color-config);
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-ripple') {
-    $color: theming.get-color-config($theme);
     @if inspection.theme-has($theme, color) {
       @include color($theme);
     }
diff --git a/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss b/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss
@@ -19,7 +19,7 @@
   }
 }
 
-@mixin color($config-or-theme) {
+@mixin color($theme) {
   $is-dark-theme: inspection.get-theme-type($theme) == dark;
   $primary: inspection.get-theme-color($theme, primary);
   $accent: inspection.get-theme-color($theme, accent);
@@ -72,7 +72,7 @@
   }
 }
 
-@mixin typography($config-or-theme) {}
+@mixin typography($theme) {}
 
 @mixin _density($theme) {}
 
diff --git a/src/material/form-field/_form-field-theme.scss b/src/material/form-field/_form-field-theme.scss
@@ -11,7 +11,7 @@
 @use '../core/tokens/token-utils';
 @use './form-field-density';
 
-@mixin color($config-or-theme) {
+@mixin color($theme) {
   @include sass-utils.current-selector-or-root() {
     @include mdc-filled-text-field-theme.theme(
       tokens-mdc-filled-text-field.get-color-tokens($theme));
@@ -40,7 +40,7 @@
   }
 }
 
-@mixin typography($config-or-theme) {
+@mixin typography($theme) {
   @include sass-utils.current-selector-or-root() {
     @include mdc-filled-text-field-theme.theme(
       tokens-mdc-filled-text-field.get-typography-tokens($theme));
@@ -51,7 +51,7 @@
   }
 }
 
-@mixin density($config-or-theme) {
+@mixin density($theme) {
   @include form-field-density.private-form-field-density($theme);
 }
 
diff --git a/src/material/progress-bar/_progress-bar-theme.scss b/src/material/progress-bar/_progress-bar-theme.scss
@@ -5,7 +5,7 @@
 @use '@material/linear-progress/linear-progress-theme' as mdc-linear-progress-theme;
 @use 'sass:map';
 
-@mixin base($config-or-theme) {
+@mixin base($theme) {
   // Add default values for tokens not related to color, typography, or density.
   @include sass-utils.current-selector-or-root() {
     @include mdc-linear-progress-theme.theme(tokens-mdc-linear-progress.get-unthemable-tokens());
@@ -30,7 +30,7 @@
   @include mdc-linear-progress-theme.theme($color-tokens);
 }
 
-@mixin color($config-or-theme) {
+@mixin color($theme) {
   .mat-mdc-progress-bar {
     @include _palette-styles($theme, primary);
 
@@ -44,9 +44,9 @@
   }
 }
 
-@mixin typography($config-or-theme) {}
+@mixin typography($theme) {}
 
-@mixin density($config-or-theme) {}
+@mixin density($theme) {}
 
 @mixin theme($theme-or-color-config) {
   $theme: theming.private-legacy-get-theme($theme-or-color-config);

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`-@mixin color($config-or-theme) {`
	`27`	`+@mixin color($theme) {`
`28`	`28`	`@if inspection.get-theme-version($theme) == 1 {`
`29`	`29`	`@include _theme-from-tokens(inspection.get-theme-tokens($theme, color));`
`30`	`30`	`}`
`@@ -50,7 +50,7 @@`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`-@mixin typography($config-or-theme) {`
	`53`	`+@mixin typography($theme) {`
`54`	`54`	`@if inspection.get-theme-version($theme) == 1 {`
`55`	`55`	`@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));`
`56`	`56`	`}`
`@@ -69,7 +69,7 @@`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`-@mixin density($config-or-theme) {`
	`72`	`+@mixin density($theme) {`
`73`	`73`	`@if inspection.get-theme-version($theme) == 1 {`
`74`	`74`	`@include _theme-from-tokens(inspection.get-theme-tokens($theme, density));`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`@use '../core/mdc-helpers/mdc-helpers';`
`9`	`9`	`@use '../core/tokens/m2/mdc/checkbox' as tokens-mdc-checkbox;`
`10`	`10`
`11`		`-@mixin base($config-or-theme) {`
	`11`	`+@mixin base($theme) {`
`12`	`12`	`@if inspection.get-theme-version($config-or-theme) == 1 {`
`13`	`13`	`@include _theme-from-tokens(inspection.get-theme-tokens($config-or-theme, base));`
`14`	`14`	`}`
`@@ -19,7 +19,7 @@`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`22`		`-@mixin color($config-or-theme) {`
	`22`	`+@mixin color($theme) {`
`23`	`23`	`$config: theming.get-color-config($config-or-theme);`
`24`	`24`
`25`	`25`	`@if inspection.get-theme-version($config-or-theme) == 1 {`
`@@ -58,7 +58,7 @@`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`-@mixin typography($config-or-theme) {`
	`61`	`+@mixin typography($theme) {`
`62`	`62`	`$config: typography.private-typography-to-2018-config(`
`63`	`63`	`theming.get-typography-config($config-or-theme));`
`64`	`64`
`@@ -79,7 +79,7 @@`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`-@mixin density($config-or-theme) {`
	`82`	`+@mixin density($theme) {`
`83`	`83`	`$density-scale: theming.get-density-config($config-or-theme);`
`84`	`84`
`85`	`85`	`@if inspection.get-theme-version($config-or-theme) == 1 {`
Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,21 @@`
`6`	`6`	`@use '../theming/inspection';`
`7`	`7`	`@use '../typography/typography';`
`8`	`8`
`9`		`-@mixin color($config-or-theme) {`
	`9`	`+@mixin color($theme) {`
`10`	`10`	`@include sass-utils.current-selector-or-root() {`
`11`	`11`	`@include token-utils.create-token-values(tokens-mat-optgroup.$prefix,`
`12`	`12`	`tokens-mat-optgroup.get-color-tokens($theme));`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`-@mixin typography($config-or-theme) {`
	`16`	`+@mixin typography($theme) {`
`17`	`17`	`@include sass-utils.current-selector-or-root() {`
`18`	`18`	`@include token-utils.create-token-values(tokens-mat-optgroup.$prefix,`
`19`	`19`	`tokens-mat-optgroup.get-typography-tokens($theme));`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`-@mixin density($config-or-theme) {`
	`23`	`+@mixin density($theme) {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@mixin theme($theme-or-color-config) {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`@use '../theming/inspection';`
`7`	`7`	`@use '../typography/typography';`
`8`	`8`
`9`		`-@mixin color($config-or-theme) {`
	`9`	`+@mixin color($theme) {`
`10`	`10`	`@include sass-utils.current-selector-or-root() {`
`11`	`11`	`@include token-utils.create-token-values(tokens-mat-option.$prefix,`
`12`	`12`	`tokens-mat-option.get-color-tokens($theme));`
`@@ -23,14 +23,14 @@`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`-@mixin typography($config-or-theme) {`
	`26`	`+@mixin typography($theme) {`
`27`	`27`	`@include sass-utils.current-selector-or-root() {`
`28`	`28`	`@include token-utils.create-token-values(tokens-mat-option.$prefix,`
`29`	`29`	`tokens-mat-option.get-typography-tokens($theme));`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`-@mixin density($config-or-theme) {`
	`33`	`+@mixin density($theme) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@mixin theme($theme-or-color-config) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`@use '../core/tokens/token-utils';`
`12`	`12`	`@use './form-field-density';`
`13`	`13`
`14`		`-@mixin color($config-or-theme) {`
	`14`	`+@mixin color($theme) {`
`15`	`15`	`@include sass-utils.current-selector-or-root() {`
`16`	`16`	`@include mdc-filled-text-field-theme.theme(`
`17`	`17`	`tokens-mdc-filled-text-field.get-color-tokens($theme));`
`@@ -40,7 +40,7 @@`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`-@mixin typography($config-or-theme) {`
	`43`	`+@mixin typography($theme) {`
`44`	`44`	`@include sass-utils.current-selector-or-root() {`
`45`	`45`	`@include mdc-filled-text-field-theme.theme(`
`46`	`46`	`tokens-mdc-filled-text-field.get-typography-tokens($theme));`
`@@ -51,7 +51,7 @@`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`-@mixin density($config-or-theme) {`
	`54`	`+@mixin density($theme) {`
`55`	`55`	`@include form-field-density.private-form-field-density($theme);`
`56`	`56`	`}`
`57`	`57`