Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
21540cb
feat(gamut-styles)!: rebuild admin, platform, percipio and lxStudio a…
dreamwasp Oct 29, 2026
dd90133
Merge branch 'cass-gmt-1825-color-brands' into cass-gmt-1825-color-le…
dreamwasp Oct 29, 2026
4268c86
fix(gamut-styles): lxStudio stops pinning navy
dreamwasp Oct 29, 2026
47ca708
feat(gamut-styles)!: remove percipioTheme; lxStudio stops pinning yellow
dreamwasp Nov 4, 2026
e0a64e8
Merge #52 (design's sandbox update, df33b47) into cass-gmt-1825-color…
dreamwasp Nov 4, 2026
aea6fd2
Merge remote-tracking branch 'origin/cass-gmt-1825-color-brands' into…
dreamwasp Nov 4, 2026
c0cec9f
chore(gamut-styles): changeset says skillsoftTheme replaces percipioT…
dreamwasp Nov 4, 2026
b9789a9
Merge cass-gmt-1825-color-brands into cass-gmt-1825-color-legacy-brands
dreamwasp Nov 4, 2026
06ad077
Merge branch 'cass-gmt-1825-color-brands' into cass-gmt-1825-color-le…
dreamwasp Nov 4, 2026
fef0319
Merge remote-tracking branch 'origin/cass-gmt-1825-color-brands' into…
dreamwasp Nov 4, 2026
09e0187
refactor: use the singular --color- prefix for color variables
dreamwasp Nov 10, 2026
5b20d15
Merge remote-tracking branch 'origin/cass-gmt-1825-color-brands' into…
dreamwasp Nov 10, 2026
2868110
fix(storybook): drop duplicate skillsoftTheme imports
dreamwasp Nov 13, 2026
1967569
fix(gamut-styles): preload each font file once
dreamwasp Nov 13, 2026
57bb489
docs(gamut-agent-tools): cover color-roles in the scope-swap skill
dreamwasp Nov 18, 2026
f2941a7
docs(gamut-agent-tools): rename the scope-swap skill to gamut-migrati…
dreamwasp Nov 18, 2026
e58e3ab
docs(gamut-agent-tools): point the README at the gamut-migration skill
dreamwasp Nov 18, 2026
d2d0017
docs(gamut-agent-tools): drop a duplicated sentence in the migration …
dreamwasp Nov 18, 2026
020d063
docs(gamut-agent-tools): cover the migration gaps in the gamut-migrat…
dreamwasp Nov 18, 2026
427cfcb
docs(gamut-agent-tools): explain the palette defaults in the gamut-mi…
dreamwasp Nov 19, 2026
74b0682
docs(gamut-agent-tools): add hyper and yellow guidance to the gamut-m…
dreamwasp Nov 19, 2026
e5fe931
docs(gamut-agent-tools): add blue-500 guidance to the gamut-migration…
dreamwasp Nov 19, 2026
c5c5a2e
docs(gamut-agent-tools): work through open color decisions with the u…
dreamwasp Nov 19, 2026
0674e59
docs(gamut-agent-tools): stop adding stylis by hand; cover the duplic…
dreamwasp Nov 20, 2026
0c1f385
docs(gamut-agent-tools): add Video peers only for apps that import Video
dreamwasp Nov 20, 2026
19979f9
Merge branch 'stack-brands' into stack-legacy
dreamwasp Nov 20, 2026
e205370
merge: bring the brands branch and main into the legacy brands branch
dreamwasp Nov 20, 2026
6a62f65
Merge remote-tracking branch 'origin/main' into stack-legacy
dreamwasp Nov 20, 2026
f2b1450
Merge branch 'stack-brands' into stack-legacy
dreamwasp Nov 20, 2026
878ebcd
build: remove Jest and Babel configs (#81)
aresnik11 Nov 20, 2026
02847d8
Merge remote-tracking branch 'origin/main' into stack-legacy
dreamwasp Nov 20, 2026
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
3 changes: 2 additions & 1 deletion .changeset/color-system-brands.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
'@skillsoft/gamut': minor
---

Brands on the generated color system.
Brands on the generated color system, and `--color-*` variable names.

- **Breaking:** color CSS variables are renamed from `--color-*` to `--color-*`, in `@skillsoft/variance`'s `createTheme` and in `tokens.css`. Raw CSS that reads `var(--color-…)` has to be updated.
- **Breaking:** `tokens.css` puts its rules in `@layer tokens`, with `reset, base, tokens, recipes, utilities` declared first.
- Adds `originalCodecademyTheme`, today's core colors, fonts and hard-offset elevation rebuilt on the generated system. `tokens.css` carries a palette block per brand under `[data-brand]`.
- A brand can override a palette step with an exact hex, or point a role at a different step (and, optionally, a different alpha) in one mode. Overrides go through the same contrast checks as generated values.
Expand Down
11 changes: 11 additions & 0 deletions .changeset/color-system-legacy-brands.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'@skillsoft/gamut-styles': minor
---

Rebuild `adminTheme`, `platformTheme` and `lxStudioTheme` as brands of the generated color system, so they define every color role.

- Each brand takes its colors from what the old theme rendered in each job, including what it inherited from core, such as lxStudio's yellow accent. Admin and platform inherit Original Codecademy's pins (yellow exact; navy and beige not pinned). lxStudio pins only its near-white page; its yellow is generated, and its dark mode keeps the sapphire primary instead of core's yellow one.
- Fonts, weights and lxStudio's radii are unchanged. Elevation is the soft shadow drawn in the shadow roles (design's sandbox, `df33b47`); only Original Codecademy keeps the hard offset. `platformTheme` still starts in dark mode and keeps its `editor-*` code editor colors with their old values.
- The two-color brand gradient pairs primary with accent-alt for every brand with a yellow accent.
- **Visual change:** the rebuilt themes aren't pixel-identical to the old ones; role grades come from design's system. Old color names that only these themes had are gone.
- **Breaking:** `percipioTheme` and the `PercipioTheme` type are removed. `skillsoftTheme`, the new default, replaces it: it keeps Percipio's fonts, font weights and resting shadow, with colors generated from the Skillsoft brand's hues. Use `skillsoftTheme` wherever an app used `percipioTheme`.
2 changes: 2 additions & 0 deletions .changeset/quick-shoes-wonder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
51 changes: 9 additions & 42 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,55 +4,22 @@
{
"type": "node",
"request": "launch",
"name": "Jest All",
"program": "${workspaceFolder}/node_modules/.bin/jest",
"args": ["--runInBand"],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"disableOptimisticBPs": true,
"windows": {
"program": "${workspaceFolder}/node_modules/jest/bin/jest"
}
},
{
"type": "node",
"request": "launch",
"name": "Jest Current File",
"program": "${workspaceFolder}/node_modules/.bin/jest",
"args": ["${relativeFile}"],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"disableOptimisticBPs": true,
"windows": {
"program": "${workspaceFolder}/node_modules/jest/bin/jest"
}
},
{
"type": "node",
"request": "launch",
"name": "Jest Current File (Fuzzy)",
"program": "${workspaceFolder}/node_modules/.bin/jest",
"args": ["${fileBaseName}"],
"name": "Vitest All",
"program": "${workspaceFolder}/node_modules/vitest/vitest.mjs",
"args": ["run", "--project=jsdom", "--project=node"],
"cwd": "${workspaceFolder}",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"disableOptimisticBPs": true,
"windows": {
"program": "${workspaceFolder}/node_modules/jest/bin/jest"
}
"internalConsoleOptions": "neverOpen"
},
{
"type": "node",
"name": "vscode-jest-tests",
"request": "launch",
"program": "${workspaceFolder}/node_modules/.bin/jest",
"args": ["--runInBand", "--watchAll=false"],
"name": "Vitest Current File",
"program": "${workspaceFolder}/node_modules/vitest/vitest.mjs",
"args": ["run", "${relativeFile}"],
"cwd": "${workspaceFolder}",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"disableOptimisticBPs": true,
"windows": {
"program": "${workspaceFolder}/node_modules/jest/bin/jest"
}
"internalConsoleOptions": "neverOpen"
}
]
}
1 change: 0 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,5 @@
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"jest.jestCommandLine": "node_modules/.bin/jest",
"nxConsole.generateAiAgentRules": true
}
7 changes: 0 additions & 7 deletions babel.config.js

This file was deleted.

40 changes: 0 additions & 40 deletions babel.defaults.js

This file was deleted.

45 changes: 0 additions & 45 deletions jest.config.base.ts

This file was deleted.

5 changes: 0 additions & 5 deletions jest.config.ts

This file was deleted.

3 changes: 0 additions & 3 deletions jest.preset.js

This file was deleted.

14 changes: 1 addition & 13 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"libsDir": "packages"
},
"namedInputs": {
"babelConfig": ["{workspaceRoot}/babel.defaults.js"],
"default": ["{projectRoot}/**/*"],
"production": [
"default",
Expand All @@ -21,7 +20,7 @@
"build": {
"cache": true,
"dependsOn": ["^build"],
"inputs": ["production", "^production", "babelConfig", { "env": "CI" }]
"inputs": ["production", "^production", { "env": "CI" }]
},
"lint": {
"cache": true,
Expand Down Expand Up @@ -49,17 +48,6 @@
"verify": {
"cache": true,
"dependsOn": ["^build"]
},
"@nx/jest:jest": {
"cache": true,
"dependsOn": ["^build"],
"inputs": [
"default",
"^production",
"{workspaceRoot}/jest.config.base.ts",
"{workspaceRoot}/jest.preset.js",
"babelConfig"
]
}
},
"generators": {
Expand Down
15 changes: 2 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,14 @@
"devDependencies": {
"@arethetypeswrong/cli": "0.18.5",
"@babel/core": "7.24.7",
"@babel/preset-env": "^7.24.7",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@babel/plugin-syntax-jsx": "^7.27.1",
"@changesets/changelog-github": "1.0.1",
"@changesets/cli": "3.0.3",
"@codecademy/eslint-config": "8.2.0",
"@codecademy/prettier-config": "^0.2.0",
"@codecademy/tsconfig": "^0.3.0",
"@commander-js/extra-typings": "^14.0.0",
"@emotion/babel-plugin": "11.13.5",
"@emotion/jest": "^11.11.0",
"@nx/jest": "22.6.0",
"@nx/js": "22.6.0",
"@nx/react": "22.6.0",
"@nx/storybook": "22.6.0",
Expand All @@ -49,7 +45,6 @@
"@testing-library/user-event": "^14.5.2",
"@types/classnames": "2.2.10",
"@types/invariant": "2.2.29",
"@types/jest": "^30.0.0",
"@types/konami-code-js": "^0.8.0",
"@types/lodash": "4.17.23",
"@types/react": "^18.2.0",
Expand All @@ -60,7 +55,6 @@
"@vitejs/plugin-react-swc": "4.3.0",
"@vitest/browser": "^3.2.4",
"@vitest/coverage-v8": "3.2.7",
"babel-jest": "30.4.1",
"commander": "^14.0.3",
"component-test-setup": "^0.3.1",
"cpy-cli": "^4.1.0",
Expand All @@ -69,10 +63,7 @@
"eslint-plugin-lodash": "^7.4.0",
"gh-pages": "^5.0.0",
"husky": "^9.1.7",
"identity-obj-proxy": "3.0.0",
"jest": "30.4.2",
"jest-environment-jsdom": "30.4.1",
"jest-junit": "^16.0.0",
"jsdom": "^26.1.0",
"lint-staged": "^16.4.0",
"nx": "22.6.0",
"nx-cloud": "19.1.0",
Expand All @@ -85,8 +76,6 @@
"storybook-addon-deep-controls": "^0.10.0",
"svgo": "^1.3.2",
"syncpack": "^10.9.3",
"ts-jest": "^29.4.12",
"ts-node": "10.9.1",
"tsdown": "0.23.0",
"tslib": "2.4.0",
"typescript": "5.9.3",
Expand Down
18 changes: 15 additions & 3 deletions packages/.storybook/components/Elements/DocsContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import {
AssetProvider,
skillsoftTheme,
createEmotionCache,
GamutProvider,
platformPalette,
skillsoftTheme,
adminTheme,
lxStudioTheme,
CoreTheme,
platformTheme,
originalCodecademyTheme,
ColorMode,
} from '@skillsoft/gamut-styles';
Expand All @@ -22,11 +26,19 @@ export const storybookTheme = createTheme(skillsoftTheme)
.build();

const themeMap = {
admin: adminTheme,
lxStudio: lxStudioTheme,
platform: platformTheme,
skillsoft: skillsoftTheme,
originalCodecademy: originalCodecademyTheme,
} as const;

const themeSpecificStories = {};
const themeSpecificStories = {
'foundations-theme-lx-studio-theme--docs': 'lxStudio',
'foundations-theme-platform-theme--docs': 'platform',
'foundations-theme-admin-theme--docs': 'admin',
'foundations-theme-core-theme--docs': 'core',
};
export const DocsContainer: React.FC<{
context: DocsContextProps;
children: React.ReactNode;
Expand All @@ -38,7 +50,7 @@ export const DocsContainer: React.FC<{
?.storyId;

const globalTheme =
(context as any).store.userGlobals?.globals?.theme || 'skillsoft';
(context as any).store.userGlobals?.globals?.theme || 'core';
const globalLogicalProps = (context as any).store.userGlobals?.globals
?.logicalProps;
const useLogicalProperties = globalLogicalProps !== 'false';
Expand Down
13 changes: 10 additions & 3 deletions packages/.storybook/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,19 @@ export const globalTypes = {
theme: {
name: 'Theme',
description: 'Global theme for components',
defaultValue: 'skillsoft',
defaultValue: 'core',
toolbar: {
icon: 'paintbrush',
items: [
{ value: 'skillsoft', title: 'Skillsoft' },
{ value: 'originalCodecademy', title: 'Original Codecademy' },
{ value: 'core', title: 'Core' },
{ value: 'admin', title: 'Admin' },
{ value: 'lxStudio', title: 'LX Studio' },
{ value: 'platform', title: 'Learning Platform' },
{ value: 'skillsoft', title: 'Skillsoft (color spike)' },
{
value: 'originalCodecademy',
title: 'Original Codecademy (color spike)',
},
],
showName: true,
},
Expand Down
Loading
Loading