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

refactor(material/button): switch raised-button to density tokens #27866

Merged
merged 2 commits into from
Oct 5, 2023
Merged

refactor(material/button): switch raised-button to density tokens #27866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
862ce3d
refactor(material/button): switch raised-button to density tokens
wagnermaciel Sep 28, 2023
f6f3990
fixup! refactor(material/button): switch raised-button to density tokens
wagnermaciel Oct 2, 2023
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
7 changes: 6 additions & 1 deletion src/material/button/_button-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,13 @@
@mixin density($theme) {
$density-scale: theming.clamp-density(inspection.get-theme-density($theme), -3);

.mat-mdc-raised-button {
$density-tokens: tokens-mdc-button-protected.get-density-tokens($theme);
@include mdc-button-protected-theme.theme($density-tokens);
@include button-theme-private.touch-target-density($density-scale);
}

.mat-mdc-button,
.mat-mdc-raised-button,
.mat-mdc-unelevated-button,
.mat-mdc-outlined-button {
// Use `mat-mdc-button-base` to increase the specificity over the button's structural styles.
Expand Down
17 changes: 15 additions & 2 deletions src/material/core/tokens/m2/mdc/_button-protected.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
@use 'sass:map';
@use '../../token-utils';
@use '../../../mdc-helpers/mdc-helpers';
@use '../../../style/sass-utils';
@use '../../../theming/inspection';
@use '../../../theming/theming';

// The prefix used to generate the fully qualified name for tokens in this file.
$prefix: (mdc, button-protected);
Expand All @@ -15,7 +17,6 @@ $prefix: (mdc, button-protected);
@function get-unthemable-tokens() {
@return (
container-shape: 4px,
container-height: 36px,
keep-touch-target: false,

focus-ring-color: null,
Expand Down Expand Up @@ -79,7 +80,19 @@ $prefix: (mdc, button-protected);

// Tokens that can be configured through Angular Material's density theming API.
@function get-density-tokens($theme) {
@return ();
$scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
@return (
container-height:
map.get(
(
0: 36px,
-1: 32px,
-2: 28px,
-3: 24px,
),
$scale
)
);
}

// Combines the tokens generated by the above functions into a single map with placeholder values.
Expand Down
Loading