diff --git a/addons/core/tests/dummy/app/styles/app.css b/addons/core/tests/dummy/app/styles/app.css index 094cb8cbe..72fe8509d 100644 --- a/addons/core/tests/dummy/app/styles/app.css +++ b/addons/core/tests/dummy/app/styles/app.css @@ -3,4 +3,4 @@ * SPDX-License-Identifier: BUSL-1.1 */ -@import 'addon/styles/addons.scss'; +@use 'addon/styles/addons.scss'; diff --git a/addons/rose/README.md b/addons/rose/README.md index 9fedc60df..60f42e087 100644 --- a/addons/rose/README.md +++ b/addons/rose/README.md @@ -26,7 +26,7 @@ Boundary UIs. Add this addon to an Ember application's `devDependencies` as: `"rose": "workspace:*"`, for applications included in this monorepo. Application's -may then import rose styles by adding `@import 'rose';` to their stylesheets. +may then import rose styles by adding `@use 'rose';` to their stylesheets. ## Installation diff --git a/addons/rose/addon/styles/addon.scss b/addons/rose/addon/styles/addon.scss index d9496c886..2e1623993 100644 --- a/addons/rose/addon/styles/addon.scss +++ b/addons/rose/addon/styles/addon.scss @@ -3,6 +3,6 @@ * SPDX-License-Identifier: BUSL-1.1 */ -@import '@hashicorp/design-system-components'; -@import 'hds/themes/dark-mode'; -@import 'hds/overrides'; +@use '@hashicorp/design-system-components'; +@use 'hds/themes/dark-mode'; +@use 'hds/overrides'; diff --git a/addons/rose/addon/styles/hds/themes/dark-mode/index.scss b/addons/rose/addon/styles/hds/themes/dark-mode/index.scss index a210e5ae3..9aa3916ff 100644 --- a/addons/rose/addon/styles/hds/themes/dark-mode/index.scss +++ b/addons/rose/addon/styles/hds/themes/dark-mode/index.scss @@ -3,7 +3,7 @@ * SPDX-License-Identifier: BUSL-1.1 */ -@import 'color-tokens-tier-2'; +@use 'color-tokens-tier-2'; // HDS Light Mode // This is the default HDS color theme. Only Boundary custom tokens diff --git a/addons/rose/app/styles/rose/_index.scss b/addons/rose/app/styles/rose/_index.scss index 539ec51d4..d1177e6eb 100644 --- a/addons/rose/app/styles/rose/_index.scss +++ b/addons/rose/app/styles/rose/_index.scss @@ -3,7 +3,7 @@ * SPDX-License-Identifier: BUSL-1.1 */ -@import 'reset'; -@import 'variables'; -@import 'typography'; -@import 'components'; +@use 'reset'; +@use 'variables'; +@use 'typography'; +@use 'components'; diff --git a/addons/rose/app/styles/rose/components/_index.scss b/addons/rose/app/styles/rose/components/_index.scss index f3ec7d399..0d4a5b20b 100644 --- a/addons/rose/app/styles/rose/components/_index.scss +++ b/addons/rose/app/styles/rose/components/_index.scss @@ -5,18 +5,18 @@ // This list is sorted in ascending order to improve readability -@import 'button'; -@import 'card'; -@import 'cards'; -@import 'code-editor'; -@import 'dialog'; -@import 'dropdown'; -@import 'form'; -@import 'frame'; -@import 'header'; -@import 'layout'; -@import 'list'; -@import 'metadata-list'; -@import 'nav'; -@import 'page-header'; -@import 'toolbar'; +@use 'button'; +@use 'card'; +@use 'cards'; +@use 'code-editor'; +@use 'dialog'; +@use 'dropdown'; +@use 'form'; +@use 'frame'; +@use 'header'; +@use 'layout'; +@use 'list'; +@use 'metadata-list'; +@use 'nav'; +@use 'page-header'; +@use 'toolbar'; diff --git a/addons/rose/app/styles/rose/components/card/_index.scss b/addons/rose/app/styles/rose/components/card/_index.scss index b2b71c7ce..4afc206e1 100644 --- a/addons/rose/app/styles/rose/components/card/_index.scss +++ b/addons/rose/app/styles/rose/components/card/_index.scss @@ -3,4 +3,4 @@ * SPDX-License-Identifier: BUSL-1.1 */ -@import 'link'; +@use 'link'; diff --git a/addons/rose/app/styles/rose/components/dialog/_index.scss b/addons/rose/app/styles/rose/components/dialog/_index.scss index 604401c8d..1c2a9ef81 100644 --- a/addons/rose/app/styles/rose/components/dialog/_index.scss +++ b/addons/rose/app/styles/rose/components/dialog/_index.scss @@ -3,4 +3,4 @@ * SPDX-License-Identifier: BUSL-1.1 */ -@import 'dialog'; +@use 'dialog'; diff --git a/addons/rose/app/styles/rose/components/dropdown/_index.scss b/addons/rose/app/styles/rose/components/dropdown/_index.scss index 678224870..985de15d3 100644 --- a/addons/rose/app/styles/rose/components/dropdown/_index.scss +++ b/addons/rose/app/styles/rose/components/dropdown/_index.scss @@ -3,9 +3,9 @@ * SPDX-License-Identifier: BUSL-1.1 */ -@import 'dropdown'; -@import 'button'; -@import 'link'; -@import 'item'; -@import 'section'; -@import 'key-value'; +@use 'dropdown'; +@use 'button'; +@use 'link'; +@use 'item'; +@use 'section'; +@use 'key-value'; diff --git a/addons/rose/app/styles/rose/components/form/_index.scss b/addons/rose/app/styles/rose/components/form/_index.scss index 41d0c795a..5d8c7f0da 100644 --- a/addons/rose/app/styles/rose/components/form/_index.scss +++ b/addons/rose/app/styles/rose/components/form/_index.scss @@ -3,10 +3,10 @@ * SPDX-License-Identifier: BUSL-1.1 */ -@import 'label'; -@import 'errors'; -@import 'helper-text'; -@import 'input'; -@import 'checkbox'; -@import 'select'; -@import 'fieldset'; +@use 'label'; +@use 'errors'; +@use 'helper-text'; +@use 'input'; +@use 'checkbox'; +@use 'select'; +@use 'fieldset'; diff --git a/addons/rose/app/styles/rose/components/form/_select.scss b/addons/rose/app/styles/rose/components/form/_select.scss index feb9ce6b6..baff30843 100644 --- a/addons/rose/app/styles/rose/components/form/_select.scss +++ b/addons/rose/app/styles/rose/components/form/_select.scss @@ -3,8 +3,8 @@ * SPDX-License-Identifier: BUSL-1.1 */ -@use '../../variables/sizing'; @use '../../utilities/type'; +@use '../../variables/sizing'; .rose-form-select { margin-bottom: sizing.rems(m); @@ -22,7 +22,7 @@ padding: sizing.rems(xs) sizing.rems(xxl) sizing.rems(xs) sizing.rems(xs); border: sizing.rems(xxxxs) solid var(--ui-gray-subtler-2); border-radius: sizing.rems(xxxs); - box-shadow: 0 $size-xxs $size-xxs + box-shadow: 0 sizing.rems(xxs) sizing.rems(xxs) rgba(var(--stark-components), var(--opacity-2)); background: var(--ui-gray-subtler-5) url('data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M12%205.83L15.17%209l1.41-1.41L12%203%207.41%207.59%208.83%209%2012%205.83zm0%2012.34L8.83%2015l-1.41%201.41L12%2021l4.59-4.59L15.17%2015%2012%2018.17z%22%20fill%3D%22%23525761%22%2F%3E%3C%2Fsvg%3E') diff --git a/addons/rose/app/styles/rose/components/form/errors/_index.scss b/addons/rose/app/styles/rose/components/form/errors/_index.scss index 44464ad35..632c0006c 100644 --- a/addons/rose/app/styles/rose/components/form/errors/_index.scss +++ b/addons/rose/app/styles/rose/components/form/errors/_index.scss @@ -5,7 +5,7 @@ @use '../../../variables/sizing'; -@import 'message'; +@use 'message'; .rose-form-errors { margin-bottom: sizing.rems(l); diff --git a/addons/rose/app/styles/rose/components/header/_dropdown.scss b/addons/rose/app/styles/rose/components/header/_dropdown.scss index 11178cb47..e9377d2ee 100644 --- a/addons/rose/app/styles/rose/components/header/_dropdown.scss +++ b/addons/rose/app/styles/rose/components/header/_dropdown.scss @@ -5,6 +5,7 @@ @use '../../variables/sizing'; @use '../../utilities/type'; +@use '../../variables/color/sass'; $chevron: "data:image/svg+xml;utf-8,"; @@ -13,7 +14,7 @@ $chevron: "data:image/svg+xml;utf-8, .rose-layout-page {