Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/dev-app/theme-token-api.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ $dark-theme: matx.define-theme(map.set($m3-base-config, color, theme-type, dark)
html {
@include mat.checkbox-theme($light-theme);
@include mat.card-theme($light-theme);
@include mat.tooltip-theme($light-theme);
@include mat.toolbar-theme($light-theme);
}

Expand All @@ -49,6 +50,7 @@ html {

@include mat.checkbox-color($dark-theme);
@include mat.card-color($dark-theme);
@include mat.tooltip-color($dark-theme);
@include mat.toolbar-color($dark-theme);
}

Expand All @@ -59,6 +61,7 @@ html {
.demo-density-#{$scale} {
@include mat.checkbox-density($scale-theme);
@include mat.card-density($scale-theme);
@include mat.tooltip-density($scale-theme);
@include mat.toolbar-density($scale-theme);
}
}
1 change: 1 addition & 0 deletions src/material-experimental/theming/_m3-density.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ $_density-tokens: (
(mdc, elevated-card): (),
(mdc, outlined-card): (),
(mat, card): (),
(mdc, plain-tooltip): (),
(mat, toolbar): (
standard-height: (64px, 60px, 56px, 52px),
mobile-height: (56px, 52px, 48px, 44px),
Expand Down
5 changes: 5 additions & 0 deletions src/material-experimental/theming/_m3-tokens.scss
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,11 @@
mdc-tokens.md-comp-outlined-card-values($systems, $exclude-hardcoded),
$token-slots
),
_namespace-tokens(
(mdc, plain-tooltip),
mdc-tokens.md-comp-plain-tooltip-values($systems, $exclude-hardcoded),
$token-slots
),
// Choose values for our made up tokens based on MDC system tokens or sensible hardcoded
// values.
_namespace-tokens(
Expand Down
2 changes: 2 additions & 0 deletions src/material/core/tokens/m2/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
@use './mdc/snack-bar' as tokens-mdc-snack-bar;
@use './mdc/tab' as tokens-mdc-tab;
@use './mdc/tab-indicator' as tokens-mdc-tab-indicator;
@use './mdc/plain-tooltip' as tokens-mdc-plain-tooltip;

/// Gets the tokens for the given theme, m2 tokens module, and theming system.
/// @param {Map} $theme The Angular Material theme object to generate token values from.
Expand Down Expand Up @@ -82,5 +83,6 @@
_get-tokens-for-module($theme, tokens-mdc-snack-bar),
_get-tokens-for-module($theme, tokens-mdc-tab),
_get-tokens-for-module($theme, tokens-mdc-tab-indicator),
_get-tokens-for-module($theme, tokens-mdc-plain-tooltip),
);
}
80 changes: 56 additions & 24 deletions src/material/tooltip/_tooltip-theme.scss
Original file line number Diff line number Diff line change
@@ -1,55 +1,87 @@
@use 'sass:map';
@use '@material/tooltip/plain-tooltip-theme' as mdc-plain-tooltip-theme;
@use '../core/style/sass-utils';
@use '../core/theming/theming';
@use '../core/theming/inspection';
@use '../core/typography/typography';
@use '../core/tokens/m2/mdc/plain-tooltip' as m2-mdc-plain-tooltip;
@use '../core/tokens/m2/mdc/plain-tooltip' as tokens-mdc-plain-tooltip;

@mixin base($theme) {
// Add default values for tokens not related to color, typography, or density.
@include sass-utils.current-selector-or-root() {
@include mdc-plain-tooltip-theme.theme(m2-mdc-plain-tooltip.get-unthemable-tokens());
@if inspection.get-theme-version($theme) == 1 {
@include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
}
@else {
// Add default values for tokens not related to color, typography, or density.
@include sass-utils.current-selector-or-root() {
@include mdc-plain-tooltip-theme.theme(tokens-mdc-plain-tooltip.get-unthemable-tokens());
}
}
}

@mixin color($theme) {
$mdc-tooltip-color-tokens: m2-mdc-plain-tooltip.get-color-tokens($theme);
@if inspection.get-theme-version($theme) == 1 {
@include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
}
@else {
$mdc-tooltip-color-tokens: tokens-mdc-plain-tooltip.get-color-tokens($theme);

// Add values for MDC tooltip tokens.
@include sass-utils.current-selector-or-root() {
@include mdc-plain-tooltip-theme.theme($mdc-tooltip-color-tokens);
// Add values for MDC tooltip tokens.
@include sass-utils.current-selector-or-root() {
@include mdc-plain-tooltip-theme.theme($mdc-tooltip-color-tokens);
}
}
}

@mixin typography($theme) {
$mdc-tooltip-typography-tokens: m2-mdc-plain-tooltip.get-typography-tokens($theme);
@if inspection.get-theme-version($theme) == 1 {
@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
}
@else {
$mdc-tooltip-typography-tokens: tokens-mdc-plain-tooltip.get-typography-tokens($theme);

// Add values for MDC tooltip tokens.
@include sass-utils.current-selector-or-root() {
@include mdc-plain-tooltip-theme.theme($mdc-tooltip-typography-tokens);
// Add values for MDC tooltip tokens.
@include sass-utils.current-selector-or-root() {
@include mdc-plain-tooltip-theme.theme($mdc-tooltip-typography-tokens);
}
}
}

@mixin density($theme) {
$mdc-tooltip-density-tokens: m2-mdc-plain-tooltip.get-density-tokens($theme);
@if inspection.get-theme-version($theme) == 1 {
@include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
}
@else {
$mdc-tooltip-density-tokens: tokens-mdc-plain-tooltip.get-density-tokens($theme);

// Add values for MDC tooltip tokens.
@include sass-utils.current-selector-or-root() {
@include mdc-plain-tooltip-theme.theme($mdc-tooltip-density-tokens);
// Add values for MDC tooltip tokens.
@include sass-utils.current-selector-or-root() {
@include mdc-plain-tooltip-theme.theme($mdc-tooltip-density-tokens);
}
}
}

@mixin theme($theme) {
@include theming.private-check-duplicate-theme-styles($theme, 'mat-tooltip') {
@include base($theme);
@if inspection.theme-has($theme, color) {
@include color($theme);
}
@if inspection.theme-has($theme, density) {
@include density($theme);
@if inspection.get-theme-version($theme) == 1 {
@include _theme-from-tokens(inspection.get-theme-tokens($theme));
}
@if inspection.theme-has($theme, typography) {
@include typography($theme);
@else {
@include base($theme);
@if inspection.theme-has($theme, color) {
@include color($theme);
}
@if inspection.theme-has($theme, density) {
@include density($theme);
}
@if inspection.theme-has($theme, typography) {
@include typography($theme);
}
}
}
}

@mixin _theme-from-tokens($tokens) {
@if $tokens != () {
@include mdc-plain-tooltip-theme.theme(map.get($tokens, tokens-mdc-plain-tooltip.$prefix));
}
}