From 951d366687ac3f5ba6c63f28e0957affea5c6c0e Mon Sep 17 00:00:00 2001 From: Andrew Seguin Date: Fri, 2 May 2025 16:07:56 -0600 Subject: [PATCH 1/3] fix(material/button): remove internal-only M2 styles --- src/material/button/_m2-fab.scss | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/material/button/_m2-fab.scss b/src/material/button/_m2-fab.scss index dc97ca38d57f..bc3d4a72d5cc 100644 --- a/src/material/button/_m2-fab.scss +++ b/src/material/button/_m2-fab.scss @@ -61,28 +61,10 @@ // Generates the mapping for the properties that change based on the FAB palette color. @function private-get-color-palette-color-tokens($theme, $palette-name) { - // Ideally we would derive all values directly from the theme, but it causes a lot of regressions - // internally. For now we fall back to the old hardcoded behavior only for internal apps. - $foreground-color: null; - $state-layer-color: null; - $ripple-color: null; $contrast-color: inspection.get-theme-color($theme, $palette-name, default-contrast); - - @if (m2-utils.$private-is-internal-build or - meta.type-of($contrast-color) != 'color') { - $is-dark: inspection.get-theme-type($theme) == dark; - $container-color: inspection.get-theme-color($theme, $palette-name); - $contrast-tone: m2-utils.contrast-tone($container-color, $is-dark); - $color: if($contrast-tone == 'dark', #000, #fff); - $foreground-color: $color; - $state-layer-color: $color; - $ripple-color: rgba($color, 0.1); - } - @else { - $foreground-color: inspection.get-theme-color($theme, $palette-name, default-contrast, 1); - $state-layer-color: inspection.get-theme-color($theme, $palette-name, default-contrast, 1); - $ripple-color: inspection.get-theme-color($theme, $palette-name, default-contrast, 0.1); - } + $foreground-color: inspection.get-theme-color($theme, $palette-name, default-contrast, 1); + $state-layer-color: inspection.get-theme-color($theme, $palette-name, default-contrast, 1); + $ripple-color: inspection.get-theme-color($theme, $palette-name, default-contrast, 0.1); @return ( fab-container-color: inspection.get-theme-color($theme, $palette-name, default), From c2ae20231758f4e1676c1f4db36f89cef9c478c6 Mon Sep 17 00:00:00 2001 From: Andrew Seguin Date: Fri, 2 May 2025 16:11:24 -0600 Subject: [PATCH 2/3] fix(material/button): lint --- src/material/button/_m2-fab.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/material/button/_m2-fab.scss b/src/material/button/_m2-fab.scss index bc3d4a72d5cc..176377ba4b88 100644 --- a/src/material/button/_m2-fab.scss +++ b/src/material/button/_m2-fab.scss @@ -1,4 +1,3 @@ -@use 'sass:meta'; @use '../core/tokens/m2-utils'; @use '../core/theming/theming'; @use '../core/theming/inspection'; From 47befdfcd8dd4003818b3ffe4ce18b87f49c0954 Mon Sep 17 00:00:00 2001 From: Andrew Seguin Date: Thu, 22 May 2025 20:12:40 -0600 Subject: [PATCH 3/3] refactor: lint --- src/material/button/_m2-fab.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/material/button/_m2-fab.scss b/src/material/button/_m2-fab.scss index 176377ba4b88..485641f9eb90 100644 --- a/src/material/button/_m2-fab.scss +++ b/src/material/button/_m2-fab.scss @@ -1,4 +1,3 @@ -@use '../core/tokens/m2-utils'; @use '../core/theming/theming'; @use '../core/theming/inspection'; @use '../core/style/elevation';