From a710a33312895269768c0465c3e0c88a8901f89a Mon Sep 17 00:00:00 2001 From: fajar-apri-alaska Date: Thu, 9 Nov 2023 16:09:02 +0700 Subject: [PATCH] perf(token): update token per new theming #23 - add fallback values to the tokens - keep the old WCSS because of still being used in demo/style.scss Changes to be committed: modified: demo/style.scss modified: package-lock.json modified: package.json modified: src/style-fixed.css.map modified: src/style-fixed.scss modified: src/style.css.map modified: src/style.scss --- demo/style.scss | 63 ++++++++++++++++++++++------------------- package-lock.json | 49 ++++++++++++++++++++++++-------- package.json | 10 ++++--- src/style-fixed.css.map | 2 +- src/style-fixed.scss | 2 +- src/style.css.map | 2 +- src/style.scss | 19 +++++++------ 7 files changed, 91 insertions(+), 56 deletions(-) diff --git a/demo/style.scss b/demo/style.scss index 28505fa..e1ad58e 100644 --- a/demo/style.scss +++ b/demo/style.scss @@ -7,27 +7,32 @@ // ----------------------- DO NOT EDIT ----------------------------- // Import Auro tokens -@import './../node_modules/@alaskaairux/design-tokens/dist/tokens/SCSSVariables'; -@import './../node_modules/@alaskaairux/design-tokens/dist/tokens/SassCustomProperties'; +@import './../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SCSSVariables'; +@import './../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SassCustomProperties'; // Import baseline library dependencies // Mixins -@import './../node_modules/@alaskaairux/webcorestylesheets/dist/breakpoints'; +@import './../node_modules/@aurodesignsystem/webcorestylesheets/src/breakpoints'; +// This is needed for @mixin auro_focus-hyperlink +@import './../node_modules/@alaskaairux/webcorestylesheets/dist/utilityMixins/focusVisible'; + +// Support for fallback values +@import './../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SCSSVariables.scss'; // Creates baseline output in CSS -@import './../node_modules/@alaskaairux/webcorestylesheets/dist/fonts'; -@import './../node_modules/@alaskaairux/webcorestylesheets/dist/normalize'; -@import './../node_modules/@alaskaairux/webcorestylesheets/dist/headings'; +@import './../node_modules/@aurodesignsystem/webcorestylesheets/src/fonts'; +@import './../node_modules/@aurodesignsystem/webcorestylesheets/src/normalize'; +@import './../node_modules/@aurodesignsystem/webcorestylesheets/src/headings'; $paragraph: true; -@import './../node_modules/@alaskaairux/webcorestylesheets/dist/essentials'; +@import './../node_modules/@aurodesignsystem/webcorestylesheets/src/essentials'; // Import Utility classes (will produce CSS in output) $layout-properties: margin; $layout-extensions: Right; $layout-modifiers: ( - 'md': $auro-size-md + 'md': $ds-size-200 ); -@import './../node_modules/@alaskaairux/webcorestylesheets/dist/utilityMixins/layoutPropertiesGenerator'; +@import './../node_modules/@aurodesignsystem/webcorestylesheets/src/utilityMixins/layoutPropertiesGenerator'; // Custom styles per demo pages body { @@ -45,15 +50,15 @@ main { .exampleWrapper { $stripe: #f3f3f3; - $background: var(--auro-color-base-white); + $background: var(--ds-color-base-white, $ds-color-base-white); background: repeating-linear-gradient( 45deg, $stripe, $stripe 10px, $background 10px, $background 20px); overflow: auto; } .exampleWrapper--ondark { - $stripe: var(--auro-color-background-darkest); - $background: var(--auro-color-background-darker); + $stripe: var(--ds-color-background-darkest, $ds-color-background-darkest); + $background: var(--ds-color-background-darker, $ds-color-background-darker); background: repeating-linear-gradient( 45deg, $stripe, $stripe 10px, $background 10px, $background 20px); } @@ -79,18 +84,18 @@ code[class*='language-'], pre[class*='language-'] { // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= code:not(.html):not(.css):not(.js) { - color: var(--auro-color-brand-flamingo-500); + color: var(--ds-color-brand-flamingo-500, $ds-color-brand-flamingo-500); } blockquote { margin-left: 0; - border-left: 1px solid var(--auro-color-border-active-on-light); - padding: var(--auro-size-xs); - padding-left: var(--auro-size-xl); - color: var(--auro-color-text-secondary-on-light); + border-left: 1px solid var(--ds-color-border-active-default, $ds-color-border-active-default); + padding: var(--ds-size-100, $ds-size-100); + padding-left: var(--ds-size-400, $ds-size-400); + color: var(--ds-color-text-secondary-default, $ds-color-text-secondary-default); font-weight: 200; - margin-top: var(--auro-size-lg); - margin-bottom: var(--auro-size-lg); + margin-top: var(--ds-size-300, $ds-size-300); + margin-bottom: var(--ds-size-300, $ds-size-300); p { line-height: 2; @@ -100,7 +105,7 @@ blockquote { } & + p { - margin-bottom: var(--auro-size-xl); + margin-bottom: var(--ds-size-400, $ds-size-400); } } @@ -148,8 +153,8 @@ strong { pre { overflow: auto; - background-color: var(--auro-color-base-gray-100); - margin-bottom: var(--auro-size-xxl); + background-color: var(--ds-color-brand-gray-100, $ds-color-brand-gray-100); + margin-bottom: var(--ds-size-600, $ds-size-600); code { font-size: .9rem; @@ -161,19 +166,19 @@ table { border-collapse: collapse; overflow: scroll; width: auto; - border-spacing: var(--auro-size-sm); - margin-bottom: var(--auro-size-xl); - font-weight: var(--auro-text-heading-display-weight); + border-spacing: var(--ds-size-150, $ds-size-150); + margin-bottom: var(--ds-size-400, $ds-size-400); + font-weight: var(--ds-text-heading-display-weight, $ds-text-heading-display-weight); tr { &:nth-child(even) { - background-color: var(--auro-color-base-gray-100); + background-color: var(--ds-color-brand-gray-100, $ds-color-brand-gray-100); } } th { text-align: left; - font-weight: var(--auro-text-heading-default-weight); + font-weight: var(--ds-text-heading-default-weight, $ds-text-heading-default-weight); } img { @@ -187,10 +192,10 @@ table { } thead { - border-bottom: 1px solid var(--auro-color-base-gray-200); + border-bottom: 1px solid var(--ds-color-brand-gray-200, $ds-color-brand-gray-200); border-collapse: collapse; } th, td { - padding: var(--auro-size-md); + padding: var(--ds-size-200, $ds-size-200); } diff --git a/package-lock.json b/package-lock.json index 586a207..9e13727 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,26 +1,34 @@ { "name": "@aurodesignsystem/auro-skeleton", - "version": "1.0.8", + "version": "2.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { - "@alaskaairux/design-tokens": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@alaskaairux/design-tokens/-/design-tokens-3.3.0.tgz", - "integrity": "sha512-93G5ySOBuqeGV6xn5Ml8ikklY4FB5z4ZU2wEDqouAywIrkbOpgB8WERk9Hz34H7c5xQO+ynKA/qmvXsgGUlPew==", + "@alaskaairux/webcorestylesheets": { + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/@alaskaairux/webcorestylesheets/-/webcorestylesheets-3.7.3.tgz", + "integrity": "sha512-9JgezuqVB2j43Qwr0rDhq7+KMgQ3fIrtktJ6QsQr6zgOweufQVSdUU9sdLQeNCZg94iS9rw2GOl2+oJ6yPJpwQ==", "dev": true, "requires": { - "chalk": "^4.1.1" + "chalk": "^4.1.2", + "focus-visible": "^5.1.0" } }, - "@alaskaairux/webcorestylesheets": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/@alaskaairux/webcorestylesheets/-/webcorestylesheets-3.6.2.tgz", - "integrity": "sha512-nN+n9T7OKqNGWhryqixCIBLOj85SKo6UFjAmff5cMsU5UqARj3MuhOx0U6F6YRLa4qk8r310pQ2vbkW9bMJqHA==", + "@aurodesignsystem/design-tokens": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@aurodesignsystem/design-tokens/-/design-tokens-4.2.0.tgz", + "integrity": "sha512-Uux0YeN6gnYmB5WohsqCL+iBPFP6Ea/2OnpgMtZUwDIKePRDHh2n5OsqdSFk0HsS+qMuuqJMLtMqgVCFlP2scw==", "dev": true, "requires": { - "chalk": "^4.1.2", - "focus-visible": "^5.1.0" + "chalk": "^5.3.0" + }, + "dependencies": { + "chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true + } } }, "@aurodesignsystem/eslint-config": { @@ -35,6 +43,23 @@ "eslint-plugin-lit-a11y": "^1.0.1" } }, + "@aurodesignsystem/webcorestylesheets": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@aurodesignsystem/webcorestylesheets/-/webcorestylesheets-5.0.4.tgz", + "integrity": "sha512-6250z0zPXHmCD5cA6lBi5yeFlmjBTIfIjk9CWom7HOaEquBiDD4YGUwKdOEHQS3CSAHPLcAmJkZn6i8RMAvveA==", + "dev": true, + "requires": { + "chalk": "^5.3.0" + }, + "dependencies": { + "chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true + } + } + }, "@babel/code-frame": { "version": "7.12.11", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", diff --git a/package.json b/package.json index ce2d1ad..f089c1c 100644 --- a/package.json +++ b/package.json @@ -21,15 +21,17 @@ "lit-element": "^2.5.1" }, "peerDependencies": { - "@alaskaairux/design-tokens": "^3.3.0", - "@alaskaairux/webcorestylesheets": "^3.4.0", + "@alaskaairux/webcorestylesheets": "^3.7.3", + "@aurodesignsystem/design-tokens": "^4.2.0", + "@aurodesignsystem/webcorestylesheets": "^5.0.4", "@webcomponents/webcomponentsjs": "^2.5.0", "focus-visible": "^5.2.0" }, "devDependencies": { - "@alaskaairux/design-tokens": "^3.3.0", - "@alaskaairux/webcorestylesheets": "^3.6.2", + "@alaskaairux/webcorestylesheets": "^3.7.3", + "@aurodesignsystem/design-tokens": "^4.2.0", "@aurodesignsystem/eslint-config": "^1.2.0", + "@aurodesignsystem/webcorestylesheets": "^5.0.4", "@babel/core": "^7.15.0", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-transform-runtime": "^7.15.0", diff --git a/src/style-fixed.css.map b/src/style-fixed.css.map index 85e880a..6744f81 100644 --- a/src/style-fixed.css.map +++ b/src/style-fixed.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../node_modules/@alaskaairux/design-tokens/dist/tokens/SassCustomProperties.scss","style-fixed.scss","../node_modules/@alaskaairux/webcorestylesheets/dist/_core.scss","../node_modules/@alaskaairux/webcorestylesheets/dist/utilityClasses/_displayProperties.scss","style.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAKA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAAkC;AAAA;EAElC;AAA8D;EAC9D;AAAkC;AAAA;EAElC;AAAyD;EACzD;AAAqC;AAAA;EAErC;AAAqC;AAAA;EAErC;AAAqC;AAAA;EAErC;AAAqC;AAAA;EAErC;AAAqC;AAAA;EAErC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAAuC;AAAA;EAEvC;AAAuC;AAAA;EAEvC;AAAuC;AAAA;EAEvC;AAAuC;AAAA;EAEvC;AAAuC;AAAA;EAEvC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAA2C;AAAA;EAE3C;AAA2C;AAAA;EAE3C;AAA2C;AAAA;EAE3C;AAA2C;AAAA;EAE3C;AAA2C;AAAA;EAE3C;AAAyC;AAAA;EAEzC;AAAyC;AAAA;EAEzC;AAAyC;AAAA;EAEzC;AAAyC;AAAA;EAEzC;AAAyC;AAAA;EAEzC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAAwB;EACxB;AAA4B;EAC5B;AAA0B;EAC1B;AAAwB;EACxB;AAAyB;EACzB;AAAsB;EACtB;AAAwB;EACxB;AAAsB;EACtB;AAAuB;EACvB;AAAwB;EACxB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;ACtSF;ADFA;AAAA;AAAA;AAAA;;AAKA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAAkC;AAAA;EAElC;AAA8D;EAC9D;AAAkC;AAAA;EAElC;AAAyD;EACzD;AAAqC;AAAA;EAErC;AAAqC;AAAA;EAErC;AAAqC;AAAA;EAErC;AAAqC;AAAA;EAErC;AAAqC;AAAA;EAErC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAAuC;AAAA;EAEvC;AAAuC;AAAA;EAEvC;AAAuC;AAAA;EAEvC;AAAuC;AAAA;EAEvC;AAAuC;AAAA;EAEvC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAA2C;AAAA;EAE3C;AAA2C;AAAA;EAE3C;AAA2C;AAAA;EAE3C;AAA2C;AAAA;EAE3C;AAA2C;AAAA;EAE3C;AAAyC;AAAA;EAEzC;AAAyC;AAAA;EAEzC;AAAyC;AAAA;EAEzC;AAAyC;AAAA;EAEzC;AAAyC;AAAA;EAEzC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAAwB;EACxB;AAA4B;EAC5B;AAA0B;EAC1B;AAAwB;EACxB;AAAyB;EACzB;AAAsB;EACtB;AAAwB;EACxB;AAAsB;EACtB;AAAuB;EACvB;AAAwB;EACxB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AEzQA;EAGE;;AAEA;EALF;IAMI;IACA;;;AAUF;EACE;;AAUF;EACE;;AAqBJ;EACE;;AAcA;EAEE;;ACzEN;EACE;;AAoBF;EACE;;AAoBF;EACE;;AAoBF;EACE;;AAoBF;EACE;;AAoBF;EACE;EAEA;EACA;EAEA;EACA;EACA;EAEA;;AC3HF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;IACE;;EAEF;IACE","file":"style-fixed.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SassCustomProperties.scss","style-fixed.scss","../node_modules/@aurodesignsystem/webcorestylesheets/src/_core.scss","../node_modules/@aurodesignsystem/webcorestylesheets/src/utilityClasses/_displayProperties.scss","style.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAKA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;AAAwB;EACxB;AAAuB;EACvB;AAAuB;EACvB;AAAwB;EACxB;AAAqB;EACrB;AAAuB;EACvB;AAAqB;EACrB;AAAuB;EACvB;AAAqB;EACrB;AAAuB;EACvB;AAAqB;EACrB;AAAuB;EACvB;AAAsB;EACtB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAAqD;EACrD;AAAsD;EACtD;AAAqD;EACrD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;AAAA;AAAA;AAAA;EAIA;EACA;AAA4D;EAC5D;AAA4D;EAC5D;AAAyD;AACzD;AAAA;AAAA;AAAA;EAIA;EACA;AAAuD;EACvD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;ACzcF;ADFA;AAAA;AAAA;AAAA;;AAKA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;AAAwB;EACxB;AAAuB;EACvB;AAAuB;EACvB;AAAwB;EACxB;AAAqB;EACrB;AAAuB;EACvB;AAAqB;EACrB;AAAuB;EACvB;AAAqB;EACrB;AAAuB;EACvB;AAAqB;EACrB;AAAuB;EACvB;AAAsB;EACtB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAAqD;EACrD;AAAsD;EACtD;AAAqD;EACrD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;AAAA;AAAA;AAAA;EAIA;EACA;AAA4D;EAC5D;AAA4D;EAC5D;AAAyD;AACzD;AAAA;AAAA;AAAA;EAIA;EACA;AAAuD;EACvD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AE5aA;EAGE;;AAEA;EALF;IAMI;IACA;IACA;;;AAUF;EACE;;AAUF;EACE;;AAqBJ;EACE;;AC1DJ;EACE;;AAoBF;EACE;;AAoBF;EACE;;AAoBF;EACE;;AAoBF;EACE;;AAoBF;EACE;EAEA;EACA;EAEA;EACA;EACA;EAEA;;ACxHF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;IACE;;EAEF;IACE","file":"style-fixed.css"} \ No newline at end of file diff --git a/src/style-fixed.scss b/src/style-fixed.scss index 402d429..4affbba 100644 --- a/src/style-fixed.scss +++ b/src/style-fixed.scss @@ -1,4 +1,4 @@ -@import './../node_modules/@alaskaairux/design-tokens/dist/tokens/SassCustomProperties'; +@import './../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SassCustomProperties'; :host([fixed]) { @import './style.scss'; diff --git a/src/style.css.map b/src/style.css.map index 756a784..c433149 100644 --- a/src/style.css.map +++ b/src/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../node_modules/@alaskaairux/design-tokens/dist/tokens/SassCustomProperties.scss","../node_modules/@alaskaairux/webcorestylesheets/dist/_core.scss","../node_modules/@alaskaairux/webcorestylesheets/dist/utilityClasses/_displayProperties.scss","style.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAKA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAAkC;AAAA;EAElC;AAA8D;EAC9D;AAAkC;AAAA;EAElC;AAAyD;EACzD;AAAqC;AAAA;EAErC;AAAqC;AAAA;EAErC;AAAqC;AAAA;EAErC;AAAqC;AAAA;EAErC;AAAqC;AAAA;EAErC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAAuC;AAAA;EAEvC;AAAuC;AAAA;EAEvC;AAAuC;AAAA;EAEvC;AAAuC;AAAA;EAEvC;AAAuC;AAAA;EAEvC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAA0C;AAAA;EAE1C;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAAwC;AAAA;EAExC;AAA2C;AAAA;EAE3C;AAA2C;AAAA;EAE3C;AAA2C;AAAA;EAE3C;AAA2C;AAAA;EAE3C;AAA2C;AAAA;EAE3C;AAAyC;AAAA;EAEzC;AAAyC;AAAA;EAEzC;AAAyC;AAAA;EAEzC;AAAyC;AAAA;EAEzC;AAAyC;AAAA;EAEzC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAAwB;EACxB;AAA4B;EAC5B;AAA0B;EAC1B;AAAwB;EACxB;AAAyB;EACzB;AAAsB;EACtB;AAAwB;EACxB;AAAsB;EACtB;AAAuB;EACvB;AAAwB;EACxB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;ACzQA;EAGE;;AAEA;EALF;IAMI;IACA;;;AAUF;EACE;;AAUF;EACE;;;AAqBJ;EACE;;;AAcA;EAEE;;;ACzEN;EACE;;;AAoBF;EACE;;;AAoBF;EACE;;;AAoBF;EACE;;;AAoBF;EACE;;;AAoBF;EACE;EAEA;EACA;EAEA;EACA;EACA;EAEA;;;AC3HF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;IACE;;EAEF;IACE","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SassCustomProperties.scss","../node_modules/@aurodesignsystem/webcorestylesheets/src/_core.scss","../node_modules/@aurodesignsystem/webcorestylesheets/src/utilityClasses/_displayProperties.scss","style.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAKA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;AAAwB;EACxB;AAAuB;EACvB;AAAuB;EACvB;AAAwB;EACxB;AAAqB;EACrB;AAAuB;EACvB;AAAqB;EACrB;AAAuB;EACvB;AAAqB;EACrB;AAAuB;EACvB;AAAqB;EACrB;AAAuB;EACvB;AAAsB;EACtB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAAqD;EACrD;AAAsD;EACtD;AAAqD;EACrD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;AAAA;AAAA;AAAA;EAIA;EACA;AAA4D;EAC5D;AAA4D;EAC5D;AAAyD;AACzD;AAAA;AAAA;AAAA;EAIA;EACA;AAAuD;EACvD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;AACA;AAAA;AAAA;AAAA;EAIA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AC5aA;EAGE;;AAEA;EALF;IAMI;IACA;IACA;;;AAUF;EACE;;AAUF;EACE;;;AAqBJ;EACE;;;AC1DJ;EACE;;;AAoBF;EACE;;;AAoBF;EACE;;;AAoBF;EACE;;;AAoBF;EACE;;;AAoBF;EACE;EAEA;EACA;EAEA;EACA;EACA;EAEA;;;ACxHF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;IACE;;EAEF;IACE","file":"style.css"} \ No newline at end of file diff --git a/src/style.scss b/src/style.scss index 4f69d0d..a80e1e2 100644 --- a/src/style.scss +++ b/src/style.scss @@ -4,12 +4,15 @@ // --------------------------------------------------------------------- // Import Auro tokens -@import './../node_modules/@alaskaairux/design-tokens/dist/tokens/SCSSVariables'; -@import './../node_modules/@alaskaairux/design-tokens/dist/tokens/SassCustomProperties'; +@import './../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SCSSVariables'; +@import './../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SassCustomProperties'; -@import './../node_modules/@alaskaairux/webcorestylesheets/dist/breakpoints'; -@import './../node_modules/@alaskaairux/webcorestylesheets/dist/core'; -@import './../node_modules/@alaskaairux/webcorestylesheets/dist/utilityClasses/displayProperties'; +@import './../node_modules/@aurodesignsystem/webcorestylesheets/src/breakpoints'; +@import './../node_modules/@aurodesignsystem/webcorestylesheets/src/core'; +@import './../node_modules/@aurodesignsystem/webcorestylesheets/src/utilityClasses/displayProperties'; + +// Support for fallback values +@import './../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SCSSVariables.scss'; // Support for auroElement styles // @import "./node_modules/@alaskaairux/webcorestylesheets/dist/auroElement/auroElement"; @@ -22,8 +25,8 @@ animation-iteration-count: infinite; animation-name: placeHolderShimmer; animation-timing-function: linear; - background-color: var(--auro-color-brand-neutral-100); - background-image: linear-gradient(to right,var(--auro-color-brand-neutral-100) 10%,var(--auro-color-brand-neutral-200) 40%,var(--auro-color-brand-neutral-100) 60%); + background-color: var(--ds-color-brand-neutral-100, $ds-color-brand-neutral-100); + background-image: linear-gradient(to right,var(--ds-color-brand-neutral-100, $ds-color-brand-neutral-100) 10%,var(--ds-color-brand-neutral-200, $ds-color-brand-neutral-200) 40%,var(--ds-color-brand-neutral-100, $ds-color-brand-neutral-100) 60%); background-repeat: no-repeat; background-size: 1000px 100%; } @@ -38,7 +41,7 @@ } :host([shape='rectangle']) { - border-radius: var(--auro-border-radius); + border-radius: var(--ds-border-radius, $ds-border-radius); } @keyframes placeHolderShimmer{