Skip to content
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

Jump to bottom

fix(material/button): Emit fab tokens under mixin root selector #27806

Merged
merged 1 commit into from
Oct 11, 2023
Merged

fix(material/button): Emit fab tokens under mixin root selector #27806

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 15 additions & 11 deletions src/material/button/_fab-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,32 +51,36 @@
$disabled: rgba($on-surface, 0.12);
$on-disabled: rgba($on-surface, if($is-dark, 0.5, 0.38));

.mat-mdc-fab,
.mat-mdc-mini-fab {
@include sass-utils.current-selector-or-root() {
// TODO(wagnermaciel): The ripple-theme-styles mixin depends heavily on
// being wrapped by using-mdc-theme. This workaround needs to be
// revisited w/ a more holistic solution.
@include mdc-helpers.using-mdc-theme($theme) {
@include button-theme-private.ripple-theme-styles($theme, true);
.mat-mdc-fab,
.mat-mdc-mini-fab {
@include mdc-helpers.using-mdc-theme($theme) {
@include button-theme-private.ripple-theme-styles($theme, true);
}
}

@include button-theme-private.apply-disabled-style() {
@include _fab-variant($on-disabled, $disabled);
:disabled, a[disabled='true'] {
@include button-theme-private.apply-disabled-style() {
@include _fab-variant($on-disabled, $disabled);
}
}

&.mat-unthemed {
.mat-unthemed {
@include _fab-variant($on-surface, $surface);
}

&.mat-primary {
.mat-primary {
@include _fab-variant($on-primary, $primary);
}

&.mat-accent {
.mat-accent {
@include _fab-variant($on-accent, $accent);
}

&.mat-warn {
.mat-warn {
@include _fab-variant($on-warn, $warn);
}
}
Expand All @@ -88,7 +92,7 @@
}

$typography-tokens: tokens-mdc-extended-fab.get-typography-tokens($theme);
.mat-mdc-extended-fab {
@include sass-utils.current-selector-or-root() {
@include mdc-extended-fab-theme.theme($typography-tokens);
}
}
Expand Down
Loading