diff --git a/addon/styles/_pix-app-layout.scss b/addon/styles/_pix-app-layout.scss index 828912e83..3bd877fa7 100644 --- a/addon/styles/_pix-app-layout.scss +++ b/addon/styles/_pix-app-layout.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/breakpoints"; + .pix-app-layout { display: grid; grid-template-areas: @@ -21,7 +23,7 @@ grid-area: footer; } - @include device-is('mobile') { + @include breakpoints.device-is('mobile') { display: block } diff --git a/addon/styles/_pix-background-header.scss b/addon/styles/_pix-background-header.scss index 2a8a34693..4bff4e8c2 100644 --- a/addon/styles/_pix-background-header.scss +++ b/addon/styles/_pix-background-header.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/colors"; + .pix-background-header { position: relative; padding: 68px var(--pix-spacing-6x) 0; @@ -10,7 +12,7 @@ width: 100%; min-height: 270px; color: var(--pix-neutral-0); - background: $pix-primary-app-gradient; + background: colors.$pix-primary-app-gradient; box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.1); } diff --git a/addon/styles/_pix-block.scss b/addon/styles/_pix-block.scss index 1d8261cf3..7612a6780 100644 --- a/addon/styles/_pix-block.scss +++ b/addon/styles/_pix-block.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/shadows"; + .pix-block { position: relative; background-color: var(--pix-neutral-0); diff --git a/addon/styles/_pix-button-base.scss b/addon/styles/_pix-button-base.scss index c5b53cbcc..7ab9e0173 100644 --- a/addon/styles/_pix-button-base.scss +++ b/addon/styles/_pix-button-base.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + .pix-button { display: flex; align-items: center; diff --git a/addon/styles/_pix-filter-banner.scss b/addon/styles/_pix-filter-banner.scss index f3ebfa986..9ec615c3d 100644 --- a/addon/styles/_pix-filter-banner.scss +++ b/addon/styles/_pix-filter-banner.scss @@ -1,3 +1,6 @@ +@use "pix-design-tokens/breakpoints"; +@use "pix-design-tokens/shadows"; + .pix-filter-banner { @extend %pix-shadow-sm; @@ -46,7 +49,7 @@ padding-right: var(--pix-spacing-1x); } -@include device-is('tablet') { +@include breakpoints.device-is('tablet') { .pix-filter-banner { flex-direction: row; gap: var(--pix-spacing-6x); diff --git a/addon/styles/_pix-filterable-and-searchable-select.scss b/addon/styles/_pix-filterable-and-searchable-select.scss index 8a533c167..a2cc6f7b8 100644 --- a/addon/styles/_pix-filterable-and-searchable-select.scss +++ b/addon/styles/_pix-filterable-and-searchable-select.scss @@ -1,3 +1,5 @@ +@use "component-state/form"; + .pix-filterable-and-searchable-select { display: flex; max-width: 100%; diff --git a/addon/styles/_pix-indicator-card.scss b/addon/styles/_pix-indicator-card.scss index b43088e6f..515116b60 100644 --- a/addon/styles/_pix-indicator-card.scss +++ b/addon/styles/_pix-indicator-card.scss @@ -1,3 +1,6 @@ +@use "pix-design-tokens/typography"; +@use "pix-design-tokens/shadows"; + .indicator-card { @extend %pix-shadow-xs; diff --git a/addon/styles/_pix-input-code.scss b/addon/styles/_pix-input-code.scss index 39dc5991f..87429fe0b 100644 --- a/addon/styles/_pix-input-code.scss +++ b/addon/styles/_pix-input-code.scss @@ -1,3 +1,6 @@ +@use "pix-design-tokens/typography"; +@use "component-state/form"; + .pix-input-code { @extend %pix-monospace; diff --git a/addon/styles/_pix-input-password.scss b/addon/styles/_pix-input-password.scss index a6030b7dd..c424800e4 100644 --- a/addon/styles/_pix-input-password.scss +++ b/addon/styles/_pix-input-password.scss @@ -1,3 +1,6 @@ +@use "pix-design-tokens/typography"; +@use "component-state/form"; + .pix-input-password { position: relative; display: inline-flex; diff --git a/addon/styles/_pix-input.scss b/addon/styles/_pix-input.scss index dacd5853f..f779cbb3f 100644 --- a/addon/styles/_pix-input.scss +++ b/addon/styles/_pix-input.scss @@ -1,3 +1,5 @@ +@use "component-state/form"; + .pix-input { position: relative; display: inline-flex; diff --git a/addon/styles/_pix-label.scss b/addon/styles/_pix-label.scss index 284eae839..72b93c301 100644 --- a/addon/styles/_pix-label.scss +++ b/addon/styles/_pix-label.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + .pix-label { display: block; color: var(--pix-neutral-900); diff --git a/addon/styles/_pix-modal.scss b/addon/styles/_pix-modal.scss index 937af94e6..d1404089a 100644 --- a/addon/styles/_pix-modal.scss +++ b/addon/styles/_pix-modal.scss @@ -1,3 +1,7 @@ +@use "pix-design-tokens/breakpoints"; +@use "pix-design-tokens/typography"; +@use "pix-design-tokens/shadows"; + .pix-modal__overlay { position: fixed; top: 0; @@ -58,7 +62,7 @@ flex-shrink: 0; margin-top: -4px; - @include device-is('tablet') { + @include breakpoints.device-is('tablet') { width: var(--pix-spacing-10x); height: var(--pix-spacing-10x); } @@ -71,7 +75,7 @@ padding-right: var(--pix-spacing-8x) + var(--pix-spacing-2x); color: var(--pix-neutral-900); - @include device-is('tablet') { + @include breakpoints.device-is('tablet') { padding-right: var(--pix-spacing-10x) + var(--pix-spacing-2x); } } diff --git a/addon/styles/_pix-multi-select.scss b/addon/styles/_pix-multi-select.scss index 1281d70eb..799790c6c 100644 --- a/addon/styles/_pix-multi-select.scss +++ b/addon/styles/_pix-multi-select.scss @@ -1,3 +1,7 @@ +@use "pix-design-tokens/typography"; +@use "component-state/form"; +@use "pix-design-tokens/shadows"; + .pix-multi-select { position: relative; display: inline-flex; diff --git a/addon/styles/_pix-navigation-button.scss b/addon/styles/_pix-navigation-button.scss index 684e05ba7..43d85f0da 100644 --- a/addon/styles/_pix-navigation-button.scss +++ b/addon/styles/_pix-navigation-button.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + .pix-navigation-button { @extend %pix-body-s; diff --git a/addon/styles/_pix-navigation-separator.scss b/addon/styles/_pix-navigation-separator.scss index e11cb9209..06912757e 100644 --- a/addon/styles/_pix-navigation-separator.scss +++ b/addon/styles/_pix-navigation-separator.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + .pix-navigation-separator { @extend %pix-body-l; diff --git a/addon/styles/_pix-navigation.scss b/addon/styles/_pix-navigation.scss index b18d3f2fb..8d14b823d 100644 --- a/addon/styles/_pix-navigation.scss +++ b/addon/styles/_pix-navigation.scss @@ -1,3 +1,6 @@ +@use "pix-design-tokens/breakpoints"; +@use "pix-design-tokens/typography"; + .pix-navigation { --bg-color-focus: rgb(var(--pix-neutral-100-inline), 50%); --bg-color-active: rgb(var(--pix-neutral-100-inline), 30%); @@ -24,7 +27,7 @@ border-radius: var(--pix-spacing-6x); - @include device-is('mobile') { + @include breakpoints.device-is('mobile') { position: static; flex-direction: column; align-items: stretch; @@ -51,7 +54,7 @@ margin:0 auto; } - @include device-is('mobile') { + @include breakpoints.device-is('mobile') { display:flex; flex-direction: row; align-items: center; @@ -71,7 +74,7 @@ &__burger-menu { display: none; - @include device-is('mobile') { + @include breakpoints.device-is('mobile') { display: block; margin-left:auto; @@ -100,7 +103,7 @@ gap: var(--pix-spacing-2x); align-self: stretch; - @include device-is('mobile') { + @include breakpoints.device-is('mobile') { display: none; padding: 0 var(--pix-spacing-6x); @@ -126,7 +129,7 @@ word-break: break-word; } - @include device-is('mobile') { + @include breakpoints.device-is('mobile') { display: none; .pix-navigation--opened & { @@ -148,7 +151,7 @@ padding: var(--pix-spacing-2x) var(--pix-spacing-4x); white-space: unset; - @include device-is('mobile') { + @include breakpoints.device-is('mobile') { width: auto; } } diff --git a/addon/styles/_pix-notification-alert.scss b/addon/styles/_pix-notification-alert.scss index 53d89217d..6f97cbc59 100644 --- a/addon/styles/_pix-notification-alert.scss +++ b/addon/styles/_pix-notification-alert.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + .pix-notification-alert { @extend %pix-body-s; diff --git a/addon/styles/_pix-pagination.scss b/addon/styles/_pix-pagination.scss index b32ae3248..4a7dcc60a 100644 --- a/addon/styles/_pix-pagination.scss +++ b/addon/styles/_pix-pagination.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/breakpoints"; + .pix-pagination, .pix-pagination-condensed { display: flex; @@ -42,7 +44,7 @@ } } -@include device-is('tablet') { +@include breakpoints.device-is('tablet') { .pix-pagination { gap:var(--pix-spacing-2x); justify-content: space-between; diff --git a/addon/styles/_pix-progress-bar.scss b/addon/styles/_pix-progress-bar.scss index 004c66f68..4eef9bced 100644 --- a/addon/styles/_pix-progress-bar.scss +++ b/addon/styles/_pix-progress-bar.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + .progress-bar { position: relative; display: grid; diff --git a/addon/styles/_pix-return-to.scss b/addon/styles/_pix-return-to.scss index f1cf85417..8a8909573 100644 --- a/addon/styles/_pix-return-to.scss +++ b/addon/styles/_pix-return-to.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + .pix-return-to { @extend %pix-body-l; diff --git a/addon/styles/_pix-search-input.scss b/addon/styles/_pix-search-input.scss index cfd0c1a2b..bace083f1 100644 --- a/addon/styles/_pix-search-input.scss +++ b/addon/styles/_pix-search-input.scss @@ -1,3 +1,5 @@ +@use "component-state/form"; + .pix-search-input { position: relative; display: inline-flex; diff --git a/addon/styles/_pix-select-list.scss b/addon/styles/_pix-select-list.scss index c6d7a50b1..57469e4f0 100644 --- a/addon/styles/_pix-select-list.scss +++ b/addon/styles/_pix-select-list.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + .pix-select_list { padding: var(--pix-spacing-2x); border-top: 1px solid var(--pix-neutral-20); diff --git a/addon/styles/_pix-select.scss b/addon/styles/_pix-select.scss index 3b79a1266..6066c868e 100644 --- a/addon/styles/_pix-select.scss +++ b/addon/styles/_pix-select.scss @@ -1,3 +1,7 @@ +@use "pix-design-tokens/typography"; +@use "component-state/form"; +@use "pix-design-tokens/shadows"; + .pix-select { position: relative; display: inline-flex; diff --git a/addon/styles/_pix-selectable-tag.scss b/addon/styles/_pix-selectable-tag.scss index 4f05760b3..e937edfc0 100644 --- a/addon/styles/_pix-selectable-tag.scss +++ b/addon/styles/_pix-selectable-tag.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + $checkmark-width: 0.625rem; $checkmark-width-with-space: $checkmark-width + 0.438rem; diff --git a/addon/styles/_pix-sidebar.scss b/addon/styles/_pix-sidebar.scss index fd75c9333..82ebb7b5f 100644 --- a/addon/styles/_pix-sidebar.scss +++ b/addon/styles/_pix-sidebar.scss @@ -1,3 +1,6 @@ +@use "pix-design-tokens/breakpoints"; +@use "pix-design-tokens/typography"; + .pix-sidebar__overlay { position: fixed; top: 0; @@ -46,7 +49,7 @@ &__close-button { flex-shrink: 0; - @include device-is('tablet') { + @include breakpoints.device-is('tablet') { width: var(--tablet-close-button-size); height: var(--tablet-close-button-size); } @@ -64,7 +67,7 @@ padding-right: var(--mobile-close-button-size) + var(--space-between-title-and-close-button); color: var(--pix-neutral-900); - @include device-is('tablet') { + @include breakpoints.device-is('tablet') { padding-right: var(--tablet-close-button-size) + var(--space-between-title-and-close-button); } } diff --git a/addon/styles/_pix-structure-switcher.scss b/addon/styles/_pix-structure-switcher.scss index 6f915c67a..a1c788a8f 100644 --- a/addon/styles/_pix-structure-switcher.scss +++ b/addon/styles/_pix-structure-switcher.scss @@ -1,3 +1,6 @@ +@use "pix-design-tokens/breakpoints"; +@use "pix-design-tokens/shadows"; + .pix-structure-switcher { --pix-structure-bg-hover: var(--pix-primary-100); @@ -9,7 +12,7 @@ --pix-structure-bg-hover: var(--pix-certif-50); } - @include device-is("mobile") { + @include breakpoints.device-is("mobile") { width: 100%; } @@ -33,7 +36,7 @@ overflow-y: auto; border-radius: 8px; - @include device-is('mobile') { + @include breakpoints.device-is('mobile') { position: static !important; display: none; width: 0; // force dropdown to resize to its parent diff --git a/addon/styles/_pix-table.scss b/addon/styles/_pix-table.scss index 158900375..c279b77d1 100644 --- a/addon/styles/_pix-table.scss +++ b/addon/styles/_pix-table.scss @@ -1,4 +1,5 @@ -@import 'pix-table-column'; +@use "pix-design-tokens/breakpoints"; +@use "pix-design-tokens/typography"; .pix-table { width: 100%; diff --git a/addon/styles/_pix-tag.scss b/addon/styles/_pix-tag.scss index a3b83d3b5..aa75f403a 100644 --- a/addon/styles/_pix-tag.scss +++ b/addon/styles/_pix-tag.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + .pix-tag { @extend %pix-body-s; diff --git a/addon/styles/_pix-textarea.scss b/addon/styles/_pix-textarea.scss index 97c583e0b..a337f2210 100644 --- a/addon/styles/_pix-textarea.scss +++ b/addon/styles/_pix-textarea.scss @@ -1,3 +1,5 @@ +@use "component-state/form"; + .pix-textarea { display: flex; flex-direction: column; diff --git a/addon/styles/_pix-toast.scss b/addon/styles/_pix-toast.scss index 3d4f672d2..3ea08a31a 100644 --- a/addon/styles/_pix-toast.scss +++ b/addon/styles/_pix-toast.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + .pix-toast { display: flex; width: 400px; diff --git a/addon/styles/_pix-toggle-button.scss b/addon/styles/_pix-toggle-button.scss index 0f3cb5ea9..9a0c16d4f 100644 --- a/addon/styles/_pix-toggle-button.scss +++ b/addon/styles/_pix-toggle-button.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + .pix-toggle-button { display: inline-flex; flex-direction: column; diff --git a/addon/styles/_pix-tooltip.scss b/addon/styles/_pix-tooltip.scss index 60c5326f4..68217cc90 100644 --- a/addon/styles/_pix-tooltip.scss +++ b/addon/styles/_pix-tooltip.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/shadows"; + .pix-tooltip { position: relative; display: flex; diff --git a/addon/styles/addon.scss b/addon/styles/addon.scss index 849afd24e..efc22722a 100644 --- a/addon/styles/addon.scss +++ b/addon/styles/addon.scss @@ -1,51 +1,51 @@ -@import 'pix-design-tokens'; -@import 'normalize-reset'; -@import 'a11y'; -@import 'pix-icon'; -@import 'pix-background-header'; -@import 'pix-banner-alert'; -@import 'pix-block'; -@import 'pix-button-base'; -@import 'pix-button'; -@import 'pix-accordions'; -@import 'pix-filter-banner'; -@import 'pix-icon-button'; -@import 'pix-notification-alert'; -@import 'pix-multi-select'; -@import 'pix-progress-bar'; -@import 'pix-return-to'; -@import 'pix-select'; -@import 'pix-select-list'; -@import 'pix-stars'; -@import 'pix-tag'; -@import 'pix-table'; -@import 'pix-textarea'; -@import 'pix-tooltip'; -@import 'pix-button-upload'; -@import 'pix-input'; -@import 'pix-label'; -@import 'pix-label-wrapped'; -@import 'pix-input-password'; -@import 'pix-radio-button'; -@import 'pix-modal'; -@import 'pix-sidebar'; -@import 'pix-input-code'; -@import 'pix-selectable-tag'; -@import 'pix-pagination'; -@import 'pix-checkbox'; -@import 'pix-toggle-button'; -@import 'pix-indicator-card'; -@import 'trap-focus'; -@import 'pix-search-input'; -@import 'pix-toast'; -@import 'toast-example'; -@import 'pix-navigation'; -@import 'pix-navigation-button'; -@import 'pix-navigation-separator'; -@import 'pix-app-layout'; -@import 'pix-structure-switcher'; +@use 'pix-design-tokens'; +@use 'normalize-reset'; +@use 'a11y'; +@use 'pix-icon'; +@use 'pix-background-header'; +@use 'pix-banner-alert'; +@use 'pix-block'; +@use 'pix-button-base'; +@use 'pix-button'; +@use 'pix-accordions'; +@use 'pix-filter-banner'; +@use 'pix-icon-button'; +@use 'pix-notification-alert'; +@use 'pix-multi-select'; +@use 'pix-progress-bar'; +@use 'pix-return-to'; +@use 'pix-select'; +@use 'pix-select-list'; +@use 'pix-stars'; +@use 'pix-tag'; +@use 'pix-table'; +@use 'pix-table-column'; +@use 'pix-textarea'; +@use 'pix-tooltip'; +@use 'pix-button-upload'; +@use 'pix-input'; +@use 'pix-label'; +@use 'pix-label-wrapped'; +@use 'pix-input-password'; +@use 'pix-radio-button'; +@use 'pix-modal'; +@use 'pix-sidebar'; +@use 'pix-input-code'; +@use 'pix-selectable-tag'; +@use 'pix-pagination'; +@use 'pix-checkbox'; +@use 'pix-toggle-button'; +@use 'pix-indicator-card'; +@use 'trap-focus'; +@use 'pix-search-input'; +@use 'pix-toast'; +@use 'toast-example'; +@use 'pix-navigation'; +@use 'pix-navigation-button'; +@use 'pix-navigation-separator'; +@use 'pix-app-layout'; +@use 'pix-structure-switcher'; // at the end so it can override it's children scss -@import 'pix-filterable-and-searchable-select'; -@import 'component-state'; +@use 'pix-filterable-and-searchable-select'; diff --git a/addon/styles/component-state/_form.scss b/addon/styles/component-state/_form.scss index 5b0fd3a9b..8a0b2603d 100644 --- a/addon/styles/component-state/_form.scss +++ b/addon/styles/component-state/_form.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/typography"; + %pix-input-default { @extend %pix-body-s; diff --git a/addon/styles/component-state/index.scss b/addon/styles/component-state/index.scss deleted file mode 100644 index 4870fbd94..000000000 --- a/addon/styles/component-state/index.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'form'; diff --git a/addon/styles/normalize-reset/_reset.scss b/addon/styles/normalize-reset/_reset.scss index 2df939461..b1d86dcb8 100644 --- a/addon/styles/normalize-reset/_reset.scss +++ b/addon/styles/normalize-reset/_reset.scss @@ -1,3 +1,5 @@ +@use "../pix-design-tokens/typography"; + /****** Elad Shechter's RESET *******/ /*** box sizing border-box for all elements ***/ diff --git a/addon/styles/normalize-reset/index.scss b/addon/styles/normalize-reset/index.scss index 0a7ab0c0a..6d0ece9ba 100644 --- a/addon/styles/normalize-reset/index.scss +++ b/addon/styles/normalize-reset/index.scss @@ -1,2 +1,2 @@ -@import 'normalize'; -@import 'reset'; \ No newline at end of file +@use 'normalize'; +@use 'reset'; \ No newline at end of file diff --git a/addon/styles/pix-design-tokens/_breakpoints.scss b/addon/styles/pix-design-tokens/_breakpoints.scss index 48e9cd420..e3e22cab0 100644 --- a/addon/styles/pix-design-tokens/_breakpoints.scss +++ b/addon/styles/pix-design-tokens/_breakpoints.scss @@ -1,7 +1,7 @@ @use "sass:map"; @use "sass:meta"; -$breakpoints: ( +$breakpoint-values: ( 'mobile': (max-width: 768px), 'tablet': (min-width: 769px), 'desktop': (min-width: 992px), @@ -9,8 +9,8 @@ $breakpoints: ( ) !default; @mixin device-is($breakpoint) { - @if map.has-key($breakpoints, $breakpoint) { - @media #{meta.inspect(map.get($breakpoints, $breakpoint))} { + @if map.has-key($breakpoint-values, $breakpoint) { + @media #{meta.inspect(map.get($breakpoint-values, $breakpoint))} { @content; } } @else { diff --git a/addon/styles/pix-design-tokens/_typography.scss b/addon/styles/pix-design-tokens/_typography.scss index cd4a686bd..311eea3b4 100644 --- a/addon/styles/pix-design-tokens/_typography.scss +++ b/addon/styles/pix-design-tokens/_typography.scss @@ -1,3 +1,5 @@ +@use "pix-design-tokens/breakpoints"; + // See https://www.figma.com/file/8RJ3aCSfdeQ8AZZVBBYKS8/Design-System-Pix?node-id=24%3A8 // Placeholder pour permettre l'utilisation dans une classe css si jamais le tag html a trop de classe @@ -18,11 +20,11 @@ line-height: 1.3; letter-spacing: calc(-0.02 * var(--font-size-title)); - @include device-is('tablet') { + @include breakpoints.device-is('tablet') { --font-size-title: 2.5rem; } - @include device-is('desktop') { + @include breakpoints.device-is('desktop') { --font-size-title: 3rem; } } @@ -38,11 +40,11 @@ line-height: 1.3; letter-spacing: calc(var(--letter-spacing-title) * var(--font-size-title)); - @include device-is('tablet') { + @include breakpoints.device-is('tablet') { --font-size-title: 2rem; } - @include device-is('desktop') { + @include breakpoints.device-is('desktop') { --font-size-title: 2.25rem; --letter-spacing-title: -0.01; } @@ -58,11 +60,11 @@ line-height: 1.3; letter-spacing: calc(-0.01 * var(--font-size-title)); - @include device-is('tablet') { + @include breakpoints.device-is('tablet') { --font-size-title: 1.5rem; } - @include device-is('desktop') { + @include breakpoints.device-is('desktop') { --font-size-title: 1.75rem; } } @@ -125,7 +127,7 @@ font-size: 0.875rem; line-height: 1.5; - @include device-is('tablet') { + @include breakpoints.device-is('tablet') { font-size: 1rem; } } @@ -137,7 +139,7 @@ font-size: 1rem; line-height: 1.5; - @include device-is('tablet') { + @include breakpoints.device-is('tablet') { font-size: 1.125rem; } } diff --git a/addon/styles/pix-design-tokens/index.scss b/addon/styles/pix-design-tokens/index.scss index a14e99305..1e83f08dc 100644 --- a/addon/styles/pix-design-tokens/index.scss +++ b/addon/styles/pix-design-tokens/index.scss @@ -1,6 +1,6 @@ -@import 'breakpoints'; -@import 'colors'; -@import 'fonts'; -@import 'spacing'; -@import 'shadows'; -@import 'typography'; +@use 'breakpoints'; +@use 'colors'; +@use 'fonts'; +@use 'spacing'; +@use 'shadows'; +@use 'typography'; diff --git a/package-lock.json b/package-lock.json index ad8fc295f..113ea599f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -83,7 +83,7 @@ "prettier": "^3.3.3", "qunit": "^2.22.0", "qunit-dom": "^3.0.0", - "sass": "^1.56.1", + "sass": "^1.83.1", "storybook": "^8.4.2", "stylelint": "^16.0.2", "svg-sprite": "^2.0.4", @@ -3680,21 +3680,6 @@ } } }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.24.0", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, "node_modules/@eslint-community/eslint-plugin-eslint-comments": { "version": "4.4.0", "dev": true, @@ -5932,6 +5917,316 @@ "node": ">=10" } }, + "node_modules/@parcel/watcher": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz", + "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "dependencies": { + "detect-libc": "^1.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.5.0", + "@parcel/watcher-darwin-arm64": "2.5.0", + "@parcel/watcher-darwin-x64": "2.5.0", + "@parcel/watcher-freebsd-x64": "2.5.0", + "@parcel/watcher-linux-arm-glibc": "2.5.0", + "@parcel/watcher-linux-arm-musl": "2.5.0", + "@parcel/watcher-linux-arm64-glibc": "2.5.0", + "@parcel/watcher-linux-arm64-musl": "2.5.0", + "@parcel/watcher-linux-x64-glibc": "2.5.0", + "@parcel/watcher-linux-x64-musl": "2.5.0", + "@parcel/watcher-win32-arm64": "2.5.0", + "@parcel/watcher-win32-ia32": "2.5.0", + "@parcel/watcher-win32-x64": "2.5.0" + } + }, + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz", + "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz", + "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz", + "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz", + "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz", + "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-musl": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz", + "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz", + "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz", + "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz", + "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz", + "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz", + "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-ia32": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz", + "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-x64": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz", + "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "dev": true, @@ -6033,21 +6328,6 @@ "@resvg/resvg-js-win32-x64-msvc": "2.6.2" } }, - "node_modules/@resvg/resvg-js-darwin-x64": { - "version": "2.6.2", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, "node_modules/@rollup/plugin-node-resolve": { "version": "15.2.3", "dev": true, @@ -12869,6 +13149,20 @@ "node": ">=8" } }, + "node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/detect-newline": { "version": "3.1.0", "dev": true, @@ -21740,18 +22034,6 @@ "version": "1.0.0", "license": "ISC" }, - "node_modules/fsevents": { - "version": "2.3.3", - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.2", "license": "MIT", @@ -22903,7 +23185,9 @@ } }, "node_modules/immutable": { - "version": "4.3.7", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz", + "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==", "dev": true, "license": "MIT" }, @@ -25305,6 +25589,14 @@ "dev": true, "license": "MIT" }, + "node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "dev": true, + "license": "MIT", + "optional": true + }, "node_modules/node-fetch": { "version": "2.7.0", "dev": true, @@ -33650,12 +33942,14 @@ } }, "node_modules/sass": { - "version": "1.78.0", + "version": "1.83.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz", + "integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==", "dev": true, "license": "MIT", "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", + "chokidar": "^4.0.0", + "immutable": "^5.0.2", "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { @@ -33663,6 +33957,39 @@ }, "engines": { "node": ">=14.0.0" + }, + "optionalDependencies": { + "@parcel/watcher": "^2.4.1" + } + }, + "node_modules/sass/node_modules/chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/sass/node_modules/readdirp": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", + "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, "node_modules/scheduler": { diff --git a/package.json b/package.json index 819e10fb0..8584f4ed8 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "prettier": "^3.3.3", "qunit": "^2.22.0", "qunit-dom": "^3.0.0", - "sass": "^1.56.1", + "sass": "^1.83.1", "storybook": "^8.4.2", "stylelint": "^16.0.2", "svg-sprite": "^2.0.4",