Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: make themes based off un-released tokens off github repo branch #168

Merged
merged 4 commits into from
Dec 6, 2024
Merged

chore: make themes based off un-released tokens off github repo branch #168

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5be70ad
chore: make themes based off un-released tokens off github repo branch
duttonw Dec 5, 2024
71a881e
chore: create generator to make theme entrypoints and outputs dynamic…
duttonw Dec 6, 2024
ba592e6
chore: correct storybook to use default theme, todo: make global them…
duttonw Dec 6, 2024
8c20c4f
Merge branch 'feature/tokens' of https://github.com/qld-gov-au/qgds-v…
duttonw Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions esbuild.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,30 @@ const buildConfig = {
external: ["fs", "path", "handlebars", "../img/*"],

entryPoints: [
//This needs to be dynamically generated based off the tokens theme's
{
in: "./src/js/main.js",
out: "./assets/js/main.min",
},
{
in: "./src/css/main-light.scss",
out: "./assets/css/main-light.min",
in: "./src/css/main-invert.scss",
out: "./assets/css/main-invert.min",
},
{
in: "./src/css/main-dark.scss",
out: "./assets/css/main-dark.min",
in: "./src/css/main-campaign-neon.scss",
out: "./assets/css/main-campaign-neon.min",
},
{
in: "./src/css/main-campaign-neon-invert.scss",
out: "./assets/css/main-campaign-neon-invert.min",
},
{
in: "./src/css/main-qld-maroon.scss",
out: "./assets/css/main-qld-maroon.min",
},
{
in: "./src/css/main-qld-maroon-invert.scss",
out: "./assets/css/main-qld-maroon-invert.min",
}
],

Expand Down
5 changes: 2 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"type": "module",
"devDependencies": {
"@chromatic-com/storybook": "^3.1.0",
"@qld-gov-au/qgds-tokens": "^2.1.0",
"@qld-gov-au/qgds-tokens": "git+https://github.com/qld-gov-au/qgds-tokens.git#feature/tokens-2.1.1",
"@storybook/addon-a11y": "^8.3.6",
"@storybook/addon-designs": "^8.0.3",
"@storybook/addon-essentials": "^8.3.6",
Expand Down
6 changes: 1 addition & 5 deletions src/css/main-dark.scss → src/css/defaults.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
//THIS IS A TEST NPM UPDATE
@charset "UTF-8";
// These imports have no CSS output, but provide variables, mixins and helpers to aid in construction of
// a design cutup.

@import "imports/functions.scss";
@import "imports/mixins.scss";
//@import "imports/variables.scss";
@import "imports/variables-dark.scss";

@import "imports/placeholders.scss";

// Libraries
Expand Down
9 changes: 2 additions & 7 deletions src/css/imports/variables-dark.scss → src/css/imports/variables-invert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,8 @@
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds.scss";
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-default-palette.scss";
*/
@import "mock/src/scss/styles/primitive.scss";
@import "mock/src/scss/styles/qgds.scss";
@import "mock/src/scss/styles/qgds-qld-default-palette.scss";
//@import "mock/src/scss/styles/qgds-qld-maroon-palette.scss";
//@import "mock/src/scss/styles/qgds-qld-corporate-palette.scss";
//@import "mock/src/scss/styles/qgds-qld-high-contrast-palette.scss";
//@import "mock/src/scss/styles/qgds-campaign-neon-palette.scss";
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/primitive.scss";
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds.scss";

/**
* QLD-pixelfallback enable pixel fallbacks
Expand Down
10 changes: 3 additions & 7 deletions src/css/imports/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,9 @@
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds.scss";
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-default-palette.scss";
*/
@import "mock/src/scss/styles/primitive.scss";
@import "mock/src/scss/styles/qgds.scss";
//@import "mock/src/scss/styles/qgds-qld-default-palette.scss";
@import "mock/src/scss/styles/qgds-qld-maroon-palette.scss";
//@import "mock/src/scss/styles/qgds-qld-corporate-palette.scss";
//@import "mock/src/scss/styles/qgds-qld-high-contrast-palette.scss";
//@import "mock/src/scss/styles/qgds-campaign-neon-palette.scss";
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/primitive.scss";
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds.scss";


/**
* QLD-pixelfallback enable pixel fallbacks
Expand Down
14 changes: 14 additions & 0 deletions src/css/main-campaign-neon-invert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@charset "UTF-8";
//This needs to be dynamically generated based off the tokens theme's

// These imports have no CSS output, but provide variables, mixins and helpers to aid in construction of
// a design cutup.
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-default-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-maroon-palette.scss";
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-campaign-neon-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-corporate-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-high-contrast-palette.scss";

//@import "imports/variables.scss";
@import "imports/variables-invert.scss";
@import "defaults.scss";
14 changes: 14 additions & 0 deletions src/css/main-campaign-neon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@charset "UTF-8";
//This needs to be dynamically generated based off the tokens theme's

// These imports have no CSS output, but provide variables, mixins and helpers to aid in construction of
// a design cutup.
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-default-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-maroon-palette.scss";
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-campaign-neon-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-corporate-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-high-contrast-palette.scss";

@import "imports/variables.scss";
//@import "imports/variables-invert.scss";
@import "defaults.scss";
14 changes: 14 additions & 0 deletions src/css/main-invert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@charset "UTF-8";
//This needs to be dynamically generated based off the tokens theme's

// These imports have no CSS output, but provide variables, mixins and helpers to aid in construction of
// a design cutup.
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-default-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-maroon-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-campaign-neon-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-corporate-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-high-contrast-palette.scss";

//@import "imports/variables.scss";
@import "imports/variables-invert.scss";
@import "defaults.scss";
126 changes: 0 additions & 126 deletions src/css/main-light.scss
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions src/css/main-qld-maroon-invert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@charset "UTF-8";
//This needs to be dynamically generated based off the tokens theme's

// These imports have no CSS output, but provide variables, mixins and helpers to aid in construction of
// a design cutup.
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-default-palette.scss";
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-maroon-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-campaign-neon-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-corporate-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-high-contrast-palette.scss";

//@import "imports/variables.scss";
@import "imports/variables-invert.scss";
@import "defaults.scss";
14 changes: 14 additions & 0 deletions src/css/main-qld-maroon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@charset "UTF-8";
//This needs to be dynamically generated based off the tokens theme's

// These imports have no CSS output, but provide variables, mixins and helpers to aid in construction of
// a design cutup.
///@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-default-palette.scss";
@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-maroon-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-campaign-neon-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-corporate-palette.scss";
//@import "@qld-gov-au/qgds-tokens/dist/scss/styles/qgds-qld-high-contrast-palette.scss";

@import "imports/variables.scss";
//@import "imports/variables-invert.scss";
@import "defaults.scss";
Loading
Loading