Skip to content

Commit

Permalink
fix(all)!: update tokens to 0.160
Browse files Browse the repository at this point in the history 
BREAKING CHANGE: checkbox container-width/height tokens have been renamed to container-size

PiperOrigin-RevId: 509559497
  • Loading branch information
@asyncLiz @copybara-github
asyncLiz authored and copybara-github committed Feb 14, 2023
1 parent 3693fb7 commit 9025af3
Show file tree
Hide file tree
Showing 100 changed files with 54 additions and 11,514 deletions.
13 changes: 3 additions & 10 deletions checkbox/lib/_checkbox.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ $_checkmark-bottom-left: 7px, -14px;
.outline,
.background {
border-radius: inherit;
height: var(--_container-height);
width: var(--_container-width);
height: var(--_container-size);
width: var(--_container-size);
}

.outline {
Expand Down Expand Up @@ -173,8 +173,7 @@ $_checkmark-bottom-left: 7px, -14px;
@include ripple.theme(
(
focus-color: var(--_error-focus-state-layer-color),
// TODO(b/262409702): add once token is added
// focus-opacity: var(--_error-focus-state-layer-opacity),
focus-opacity: var(--_error-focus-state-layer-opacity),
hover-color: var(--_error-hover-state-layer-color),
hover-opacity: var(--_error-hover-state-layer-opacity),
pressed-color: var(--_error-pressed-state-layer-color),
Expand Down Expand Up @@ -331,7 +330,6 @@ $_checkmark-bottom-left: 7px, -14px;

:host(:hover) .error .outline {
border-color: var(--_unselected-error-hover-outline-color);
border-width: var(--_unselected-error-hover-outline-width);
}

:host(:hover) .error .background {
Expand All @@ -357,7 +355,6 @@ $_checkmark-bottom-left: 7px, -14px;

:host(:focus-within) .error .outline {
border-color: var(--_unselected-error-focus-outline-color);
border-width: var(--_unselected-error-focus-outline-width);
}

:host(:focus-within) .error .background {
Expand All @@ -383,7 +380,6 @@ $_checkmark-bottom-left: 7px, -14px;

:host(:active) .error .outline {
border-color: var(--_unselected-error-pressed-outline-color);
border-width: var(--_unselected-error-pressed-outline-width);
}

:host(:active) .error .background {
Expand Down Expand Up @@ -448,9 +444,6 @@ $_checkmark-bottom-left: 7px, -14px;
$tokens: map.remove(
$tokens,
'selected-disabled-container-outline-width',
'selected-error-focus-outline-width',
'selected-error-hover-outline-width',
'selected-error-pressed-outline-width',
'selected-focus-outline-width',
'selected-hover-outline-width',
'selected-outline-width',
Expand Down
2 changes: 1 addition & 1 deletion docs/components/checkbox.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Token | Default value
`--md-checkbox-selected-icon-color` | `--md-sys-color-on-primary`
`--md-checkbox-container-shape` | `2px`

* [All tokens](https://github.com/material-components/material-web/blob/master/tokens/v0_152/_md-comp-checkbox.scss)
* [All tokens](https://github.com/material-components/material-web/blob/master/tokens/v0_160/_md-comp-checkbox.scss)
<!-- {.external} -->

### Example
Expand Down
2 changes: 1 addition & 1 deletion docs/components/divider.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Token | Default value
`--md-divider-color` | `--md-sys-color-outline-variant`
`--md-divider-thickness` | `1px`

* [All tokens](https://github.com/material-components/material-web/blob/master/tokens/v0_152/_md-comp-divider.scss)
* [All tokens](https://github.com/material-components/material-web/blob/master/tokens/v0_160/_md-comp-divider.scss)
<!-- {.external} -->

### Example
Expand Down
48 changes: 48 additions & 0 deletions sass/test/_color-scheme.test.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,18 @@
--md-sys-color-on-primary-rgb: 56, 30, 114;
--md-sys-color-on-primary-container: #eaddff;
--md-sys-color-on-primary-container-rgb: 234, 221, 255;
--md-sys-color-on-primary-fixed: #21005d;
--md-sys-color-on-primary-fixed-rgb: 33, 0, 93;
--md-sys-color-on-primary-fixed-variant: #4f378b;
--md-sys-color-on-primary-fixed-variant-rgb: 79, 55, 139;
--md-sys-color-on-secondary: #332d41;
--md-sys-color-on-secondary-rgb: 51, 45, 65;
--md-sys-color-on-secondary-container: #e8def8;
--md-sys-color-on-secondary-container-rgb: 232, 222, 248;
--md-sys-color-on-secondary-fixed: #1d192b;
--md-sys-color-on-secondary-fixed-rgb: 29, 25, 43;
--md-sys-color-on-secondary-fixed-variant: #4a4458;
--md-sys-color-on-secondary-fixed-variant-rgb: 74, 68, 88;
--md-sys-color-on-surface: #e6e1e5;
--md-sys-color-on-surface-rgb: 230, 225, 229;
--md-sys-color-on-surface-variant: #cac4d0;
Expand All @@ -51,6 +59,10 @@
--md-sys-color-on-tertiary-rgb: 73, 37, 50;
--md-sys-color-on-tertiary-container: #ffd8e4;
--md-sys-color-on-tertiary-container-rgb: 255, 216, 228;
--md-sys-color-on-tertiary-fixed: #31111d;
--md-sys-color-on-tertiary-fixed-rgb: 49, 17, 29;
--md-sys-color-on-tertiary-fixed-variant: #633b48;
--md-sys-color-on-tertiary-fixed-variant-rgb: 99, 59, 72;
--md-sys-color-outline: #938f99;
--md-sys-color-outline-rgb: 147, 143, 153;
--md-sys-color-outline-variant: #49454f;
Expand All @@ -59,12 +71,20 @@
--md-sys-color-primary-rgb: 208, 188, 255;
--md-sys-color-primary-container: #4f378b;
--md-sys-color-primary-container-rgb: 79, 55, 139;
--md-sys-color-primary-fixed: #eaddff;
--md-sys-color-primary-fixed-rgb: 234, 221, 255;
--md-sys-color-primary-fixed-dim: #d0bcff;
--md-sys-color-primary-fixed-dim-rgb: 208, 188, 255;
--md-sys-color-scrim: #000;
--md-sys-color-scrim-rgb: 0, 0, 0;
--md-sys-color-secondary: #ccc2dc;
--md-sys-color-secondary-rgb: 204, 194, 220;
--md-sys-color-secondary-container: #4a4458;
--md-sys-color-secondary-container-rgb: 74, 68, 88;
--md-sys-color-secondary-fixed: #e8def8;
--md-sys-color-secondary-fixed-rgb: 232, 222, 248;
--md-sys-color-secondary-fixed-dim: #ccc2dc;
--md-sys-color-secondary-fixed-dim-rgb: 204, 194, 220;
--md-sys-color-shadow: #000;
--md-sys-color-shadow-rgb: 0, 0, 0;
--md-sys-color-surface: #1c1b1f;
Expand All @@ -91,6 +111,10 @@
--md-sys-color-tertiary-rgb: 239, 184, 200;
--md-sys-color-tertiary-container: #633b48;
--md-sys-color-tertiary-container-rgb: 99, 59, 72;
--md-sys-color-tertiary-fixed: #ffd8e4;
--md-sys-color-tertiary-fixed-rgb: 255, 216, 228;
--md-sys-color-tertiary-fixed-dim: #efb8c8;
--md-sys-color-tertiary-fixed-dim-rgb: 239, 184, 200;
}
}
}
Expand Down Expand Up @@ -128,10 +152,18 @@
--md-sys-color-on-primary-rgb: 255, 255, 255;
--md-sys-color-on-primary-container: #21005d;
--md-sys-color-on-primary-container-rgb: 33, 0, 93;
--md-sys-color-on-primary-fixed: #21005d;
--md-sys-color-on-primary-fixed-rgb: 33, 0, 93;
--md-sys-color-on-primary-fixed-variant: #4f378b;
--md-sys-color-on-primary-fixed-variant-rgb: 79, 55, 139;
--md-sys-color-on-secondary: #fff;
--md-sys-color-on-secondary-rgb: 255, 255, 255;
--md-sys-color-on-secondary-container: #1d192b;
--md-sys-color-on-secondary-container-rgb: 29, 25, 43;
--md-sys-color-on-secondary-fixed: #1d192b;
--md-sys-color-on-secondary-fixed-rgb: 29, 25, 43;
--md-sys-color-on-secondary-fixed-variant: #4a4458;
--md-sys-color-on-secondary-fixed-variant-rgb: 74, 68, 88;
--md-sys-color-on-surface: #1c1b1f;
--md-sys-color-on-surface-rgb: 28, 27, 31;
--md-sys-color-on-surface-variant: #49454f;
Expand All @@ -140,6 +172,10 @@
--md-sys-color-on-tertiary-rgb: 255, 255, 255;
--md-sys-color-on-tertiary-container: #31111d;
--md-sys-color-on-tertiary-container-rgb: 49, 17, 29;
--md-sys-color-on-tertiary-fixed: #31111d;
--md-sys-color-on-tertiary-fixed-rgb: 49, 17, 29;
--md-sys-color-on-tertiary-fixed-variant: #633b48;
--md-sys-color-on-tertiary-fixed-variant-rgb: 99, 59, 72;
--md-sys-color-outline: #79747e;
--md-sys-color-outline-rgb: 121, 116, 126;
--md-sys-color-outline-variant: #cac4d0;
Expand All @@ -148,12 +184,20 @@
--md-sys-color-primary-rgb: 103, 80, 164;
--md-sys-color-primary-container: #eaddff;
--md-sys-color-primary-container-rgb: 234, 221, 255;
--md-sys-color-primary-fixed: #eaddff;
--md-sys-color-primary-fixed-rgb: 234, 221, 255;
--md-sys-color-primary-fixed-dim: #d0bcff;
--md-sys-color-primary-fixed-dim-rgb: 208, 188, 255;
--md-sys-color-scrim: #000;
--md-sys-color-scrim-rgb: 0, 0, 0;
--md-sys-color-secondary: #625b71;
--md-sys-color-secondary-rgb: 98, 91, 113;
--md-sys-color-secondary-container: #e8def8;
--md-sys-color-secondary-container-rgb: 232, 222, 248;
--md-sys-color-secondary-fixed: #e8def8;
--md-sys-color-secondary-fixed-rgb: 232, 222, 248;
--md-sys-color-secondary-fixed-dim: #ccc2dc;
--md-sys-color-secondary-fixed-dim-rgb: 204, 194, 220;
--md-sys-color-shadow: #000;
--md-sys-color-shadow-rgb: 0, 0, 0;
--md-sys-color-surface: #fffbfe;
Expand All @@ -180,6 +224,10 @@
--md-sys-color-tertiary-rgb: 125, 82, 96;
--md-sys-color-tertiary-container: #ffd8e4;
--md-sys-color-tertiary-container-rgb: 255, 216, 228;
--md-sys-color-tertiary-fixed: #ffd8e4;
--md-sys-color-tertiary-fixed-rgb: 255, 216, 228;
--md-sys-color-tertiary-fixed-dim: #efb8c8;
--md-sys-color-tertiary-fixed-dim-rgb: 239, 184, 200;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tokens/_index.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
// SPDX-License-Identifier: Apache-2.0
//

@forward './v0_152';
@forward './v0_160';
107 changes: 0 additions & 107 deletions tokens/v0_152/_index.scss
View file

This file was deleted.

Loading

0 comments on commit 9025af3

Please sign in to comment.