Skip to content

Commit

Permalink
feat(tokens): implement new design tokens #2
Browse files Browse the repository at this point in the history
  • Loading branch information
jordanjones243 committed Jan 24, 2024
1 parent a533608 commit 36e6338
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 16 deletions.
2 changes: 1 addition & 1 deletion demo/api.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
type="text/css"
href="https://cdn.jsdelivr.net/npm/[email protected]/themes/prism.css"
/>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@alaskaairux/design-tokens@latest/dist/tokens/CSSCustomProperties.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@aurodesignsystem/design-tokens@latest/dist/tokens/CSSCustomProperties.css">
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/@aurodesignsystem/webcorestylesheets@latest/dist/demoWrapper.css" />
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/@aurodesignsystem/webcorestylesheets@latest/dist/elementDemoStyles.css" />
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
type="text/css"
href="https://cdn.jsdelivr.net/npm/[email protected]/themes/prism.css"
/>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@alaskaairux/design-tokens@latest/dist/tokens/CSSCustomProperties.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@aurodesignsystem/design-tokens@latest/dist/tokens/CSSCustomProperties.css">
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/@aurodesignsystem/webcorestylesheets@latest/dist/demoWrapper.css" />
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/@aurodesignsystem/webcorestylesheets@latest/dist/elementDemoStyles.css" />
</head>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"main": "index.js",
"license": "Apache-2.0",
"engines": {
"node": "^18.x || ^20.x "
"node": "^18.x || ^20.x"
},
"dependencies": {
"chalk": "^5.3.0",
Expand Down
2 changes: 1 addition & 1 deletion src/style-fixed.scss
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/style-unformatted-fixed.scss
Original file line number Diff line number Diff line change
@@ -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-unformatted.scss';
Expand Down
14 changes: 8 additions & 6 deletions src/style-unformatted.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
@import "./../node_modules/@alaskaairux/design-tokens/dist/tokens/SCSSVariables";
@import "./../node_modules/@alaskaairux/design-tokens/dist/tokens/SassCustomProperties";
@import "./../node_modules/@alaskaairux/webcorestylesheets/dist/breakpoints";
@import "./../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SCSSVariables";
@import "./../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SassCustomProperties";
@import "./../node_modules/@aurodesignsystem/webcorestylesheets/src/breakpoints";

/* stylelint-disable scss/selector-nest-combinators */

[unformatted] .unformattedWrapper {
padding: var(--auro-size-xl);
padding: var(--ds-size-400, $ds-size-400);

@include auro_breakpoint--md {
padding: var(--auro-size-xxxl);
padding-top: var(--auro-size-xl);
padding: var(--ds-size-800, $ds-size-800);
padding-top: var(--ds-size-400, $ds-size-400);
}
}
12 changes: 7 additions & 5 deletions src/style.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
// Copyright (c) 2020 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
// Copyright (c) 2024 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
// See LICENSE in the project root for license information.

// ---------------------------------------------------------------------
@import "./../node_modules/@alaskaairux/design-tokens/dist/tokens/SCSSVariables";
@import "./../node_modules/@alaskaairux/design-tokens/dist/tokens/SassCustomProperties";
@import "./../node_modules/@alaskaairux/webcorestylesheets/dist/breakpoints";

/* stylelint-disable declaration-empty-line-before, order/properties-order, rule-empty-line-before */

@import "./../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SCSSVariables";
@import "./../node_modules/@aurodesignsystem/design-tokens/dist/tokens/SassCustomProperties";
@import "./../node_modules/@aurodesignsystem/webcorestylesheets/src/breakpoints";

// layout styles - define any layout specifications for UI that is contained WITHIN the component
// never define layout that would cause effect on element outside the scope of this component


// Default selector setting mobile-first specs
.dialog {
top: 0;
Expand Down

0 comments on commit 36e6338

Please sign in to comment.