Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d93a970
Update semantic colors in light mode to meet min contrast, toggle vit…
gcamacho079 Apr 11, 2026
b087a59
Add text to variant story table headers
gcamacho079 Apr 11, 2026
33ff437
Update colors again to maintain appearance of solid colors like yello…
gcamacho079 Apr 11, 2026
506bdf3
Update semantic colors to use Leonardo-generated colors
gcamacho079 Apr 16, 2026
7806ca8
Update colors with hex from Leonardo to fix purple/blue issue
gcamacho079 Apr 16, 2026
81b9f30
Update the remaining colors to use Leonardo-exported palette
gcamacho079 Apr 16, 2026
bfe1901
Update loud warning colors to use inverse (dark orange text on light …
gcamacho079 Apr 16, 2026
f112d34
Fix some instances of colors not meeting contrast minimum
gcamacho079 Apr 16, 2026
07fbd8f
Set dark mode to default for testing, start working on fixing/marking…
gcamacho079 Apr 17, 2026
f94a310
Remove extra navigation role from breadcrumb component, set default l…
gcamacho079 Apr 20, 2026
cbf3d90
Build
gcamacho079 Apr 20, 2026
bc90dc1
Update chip story to include accessible button name
gcamacho079 Apr 20, 2026
22ae3e8
Add labels to chip actions and icon-only buttons
gcamacho079 Apr 20, 2026
29e7724
Turn off svg-img-alt error for now
gcamacho079 Apr 20, 2026
619b7f5
Start adding leonardo
gcamacho079 Apr 20, 2026
ca475b2
Add script to generate colors, update filenames
gcamacho079 Apr 20, 2026
c1ac4ef
Separate script to write variables from the one with the theme color …
gcamacho079 Apr 20, 2026
5b92d83
Update colors
gcamacho079 Apr 21, 2026
a4e1fae
Remove dark mode colors from colorable generate colors script, add st…
gcamacho079 Apr 22, 2026
6dc7266
Add object for looking up color increments for consistent foll/border…
gcamacho079 Apr 22, 2026
a1e84bd
Have semantic colors be auto-generated
gcamacho079 Apr 22, 2026
0c758f2
Update names and build
gcamacho079 Apr 22, 2026
33f0dc2
Refactor generate color palette script
gcamacho079 Apr 23, 2026
9f8adfa
Update docs
gcamacho079 Apr 23, 2026
f13af3e
Build
gcamacho079 Apr 23, 2026
4f86931
Remove commented code in script
gcamacho079 Apr 24, 2026
8b05b7c
Change default theme back to light
gcamacho079 Apr 24, 2026
f6eacc3
Update lightScale fxn name
gcamacho079 Apr 24, 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
5,221 changes: 2,363 additions & 2,858 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/craftcms-cp/.storybook/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const preview: Preview = {
// 'todo' - show a11y violations in the test UI only
// 'error' - fail CI on a11y violations
// 'off' - skip a11y checks entirely
test: 'todo',
test: 'error',
},
},
decorators: [
Expand Down
3 changes: 2 additions & 1 deletion packages/craftcms-cp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"build:storybook": "storybook build",
"build:manifest": "custom-elements-manifest analyze --litelement --outdir dist",
"generate:vue-wrappers": "node ./scripts/generate-vue-wrappers.js",
"generate:colors": "node ./scripts/generate-colors.js"
"generate:colors": "node ./scripts/generate-colors.js && node scripts/generate-color-palette.js"
},
"exports": {
"./package.json": "./package.json",
Expand Down Expand Up @@ -61,6 +61,7 @@
"lit": "3.x"
},
"devDependencies": {
"@adobe/leonardo-contrast-colors": "^1.1.0",
"@arethetypeswrong/cli": "^0.18.2",
"@awesome.me/webawesome": "^3.0.0",
"@chromatic-com/storybook": "^4.0.1",
Expand Down
56 changes: 56 additions & 0 deletions packages/craftcms-cp/scripts/generate-color-palette.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import {writeFileSync} from 'fs';
import {dirname, resolve} from 'path';
import {fileURLToPath} from 'url';
import {stops, lightTheme, darkTheme} from '../src/styles/color-definitions.js';

const __dirname = dirname(fileURLToPath(import.meta.url));
const ROOT = resolve(__dirname, '..');
const OUT_FILE = resolve(ROOT, 'src/styles/shared/color-palette.css');

function comment() {
return '/* Auto-generated by scripts/generate-color-palette.js — do not edit manually */';
}

function colorsToCssVariables(colors, customPrefix = null) {
let result = '';
let isFirstLine = true;
for (const color of colors) {
if (!color.values) continue;

if (!isFirstLine) result += '\n';

const declarations = color.values.map((value, index) => {
let prefix = customPrefix ? `--${customPrefix}` : `--color`;
return ` ${prefix}-${color.name}-${stops[index]}: ${value.value};`;
});

result += declarations.join('\n');
isFirstLine = false;
}
return result;
}

function printStyles() {
let lines = [];
const lightColors = colorsToCssVariables(lightTheme.contrastColors);
const darkColors = colorsToCssVariables(darkTheme.contrastColors);
const staticColors = colorsToCssVariables(
lightTheme.contrastColors,
'color-static'
);

lines.push(comment());
lines.push('\n:root,\n:host {');
lines.push(lightColors);
lines.push(` /* Static colors */\n`);
lines.push(staticColors);
lines.push('}\n');
lines.push("[data-theme='dark'] {");
lines.push(darkColors);
lines.push('}\n');

writeFileSync(OUT_FILE, lines.join('\n'));
console.log(`Generated ${OUT_FILE}`);
}

printStyles();
156 changes: 82 additions & 74 deletions packages/craftcms-cp/scripts/generate-colors.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,92 +33,80 @@ const availableColors = [
'black',
];

function lightScale(color) {
const semanticColors = {
neutral: 'slate',
brand: 'red',
accent: 'blue',
info: 'blue',
success: 'emerald',
warning: 'orange',
danger: 'red',
};

const colorIncrements = {
fill: {
quiet: 50,
normal: 100,
loud: 600,
},
foreground: {
quiet: 800,
normal: 950,
loud: 50,
},
border: {
quiet: 400,
normal: 600,
loud: 800,
},
};

function colorScale(color) {
switch (color) {
case 'white':
return {
fillQuiet: 'var(--color-white)',
fillNormal: 'var(--color-white)',
fillLoud: 'var(--color-white)',
borderQuiet: 'var(--color-gray-200)',
borderNormal: 'var(--color-gray-200)',
borderLoud: 'var(--color-gray-200)',
onQuiet: 'var(--color-gray-800)',
onNormal: 'var(--color-gray-800)',
onLoud: 'var(--color-gray-800)',
};
case 'black':
return {
fillQuiet: 'var(--color-gray-900)',
fillNormal: 'var(--color-gray-900)',
fillLoud: 'var(--color-gray-900)',
borderQuiet: 'var(--color-gray-800)',
borderNormal: 'var(--color-gray-800)',
borderLoud: 'var(--color-gray-800)',
onQuiet: 'var(--color-gray-100)',
onNormal: 'var(--color-gray-100)',
onLoud: 'var(--color-gray-100)',
};
default:
return {
fillQuiet: `var(--color-${color}-50)`,
fillNormal: `var(--color-${color}-200)`,
fillLoud: `var(--color-${color}-600)`,
borderQuiet: `var(--color-${color}-300)`,
borderNormal: `var(--color-${color}-600)`,
borderLoud: `var(--color-${color}-800)`,
onQuiet: `var(--color-${color}-800)`,
onNormal: `var(--color-${color}-700)`,
onLoud: `var(--color-${color}-50)`,
};
}
}

function darkScale(color) {
switch (color) {
case 'white':
return {
fillQuiet: 'var(--color-gray-800)',
fillNormal: 'var(--color-gray-800)',
fillLoud: 'var(--color-gray-800)',
borderQuiet: 'var(--color-gray-700)',
borderNormal: 'var(--color-gray-700)',
borderLoud: 'var(--color-gray-700)',
onQuiet: 'var(--color-gray-200)',
onNormal: 'var(--color-gray-200)',
onLoud: 'var(--color-gray-200)',
borderQuiet: 'var(--color-static-gray-200)',
borderNormal: 'var(--color-static-gray-200)',
borderLoud: 'var(--color-static-gray-200)',
onQuiet: 'var(--color-static-gray-800)',
onNormal: 'var(--color-static-gray-800)',
onLoud: 'var(--color-static-gray-800)',
};
case 'black':
return {
fillQuiet: 'var(--color-gray-950)',
fillNormal: 'var(--color-gray-950)',
fillLoud: 'var(--color-gray-950)',
borderQuiet: 'var(--color-gray-800)',
borderNormal: 'var(--color-gray-800)',
borderLoud: 'var(--color-gray-800)',
onQuiet: 'var(--color-gray-300)',
onNormal: 'var(--color-gray-300)',
onLoud: 'var(--color-gray-300)',
fillQuiet: 'var(--color-static-gray-900)',
fillNormal: 'var(--color-static-gray-900)',
fillLoud: 'var(--color-static-gray-900)',
borderQuiet: 'var(--color-static-gray-800)',
borderNormal: 'var(--color-static-gray-800)',
borderLoud: 'var(--color-static-gray-800)',
onQuiet: 'var(--color-static-gray-100)',
onNormal: 'var(--color-static-gray-100)',
onLoud: 'var(--color-static-gray-100)',
};
default:
const {fill, border, foreground} = colorIncrements;
return {
fillQuiet: `var(--color-${color}-950)`,
fillNormal: `var(--color-${color}-600)`,
fillLoud: `var(--color-${color}-500)`,
borderQuiet: `var(--color-${color}-900)`,
borderNormal: `var(--color-${color}-900)`,
borderLoud: `var(--color-${color}-600)`,
onQuiet: `var(--color-${color}-400)`,
onNormal: `var(--color-${color}-200)`,
onLoud: `var(--color-${color}-50)`,
fillQuiet: `var(--color-${color}-${fill.quiet})`,
fillNormal: `var(--color-${color}-${fill.normal})`,
fillLoud: `var(--color-${color}-${fill.loud})`,
borderQuiet: `var(--color-${color}-${border.quiet})`,
borderNormal: `var(--color-${color}-${border.normal})`,
borderLoud: `var(--color-${color}-${border.loud})`,
onQuiet: `var(--color-${color}-${foreground.quiet})`,
onNormal: `var(--color-${color}-${foreground.normal})`,
onLoud: `var(--color-${color}-${foreground.loud})`,
};
}
}

function buildTokens(colors, scaleFn) {
return colors
function buildColorableTokens() {
return availableColors
.map((color) => {
const s = scaleFn(color);
const s = colorScale(color);
return [
` /* ${color} */`,
` --c-color-${color}-fill-quiet: ${s.fillQuiet};`,
Expand All @@ -135,6 +123,29 @@ function buildTokens(colors, scaleFn) {
.join('\n\n');
}

function buildSemanticTokens() {
let declarations = [];
for (const [meaning, color] of Object.entries(semanticColors)) {
const s = colorScale(color);
const variables = [
` /* Semantics colors - ${meaning} */`,
` --c-color-${meaning}-fill-quiet: ${s.fillQuiet};`,
` --c-color-${meaning}-fill-normal: ${s.fillNormal};`,
` --c-color-${meaning}-fill-loud: ${s.fillLoud};`,
` --c-color-${meaning}-border-quiet: ${s.borderQuiet};`,
` --c-color-${meaning}-border-normal: ${s.borderNormal};`,
` --c-color-${meaning}-border-loud: ${s.borderLoud};`,
` --c-color-${meaning}-on-quiet: ${s.onQuiet};`,
` --c-color-${meaning}-on-normal: ${s.onNormal};`,
` --c-color-${meaning}-on-loud: ${s.onLoud};`,
].join('\n');

declarations.push(variables);
}

return declarations.join('\n\n');
}

function buildStyleBlock(color) {
return `.c-colorable--${color},
[data-color='${color}'] {
Expand All @@ -154,11 +165,8 @@ function generateStyles(colors) {
return `/* Auto-generated by scripts/generate-colors.js — do not edit manually */

:root {
${buildTokens(colors, lightScale)}
}

[data-theme='dark'] {
${buildTokens(colors, darkScale)}
${buildColorableTokens()}
${buildSemanticTokens()}
}

.c-colorable,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const meta = {
argTypes: {},
parameters: {
layout: 'centered',
a11y: {test: 'todo'},
},
decorators: [
(story) => html`
Expand Down
12 changes: 12 additions & 0 deletions packages/craftcms-cp/src/components/avatar/avatar.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@ type Story = StoryObj<CraftAvatar & typeof args>;
// More on writing stories with args: https://storybook.js.org/docs/writing-stories/args
export const Default: Story = {
args: {},
parameters: {
a11y: {
config: {
rules: [
{
id: 'svg-img-alt', // TODO: figure out best way of handling alt text for avatars
enabled: false,
},
],
},
},
},
};

export const CustomColors: Story = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {property, query, queryAssignedElements, state} from 'lit/decorators.js';
import '../icon/icon.js';
import type CraftBreadcrumbItem from '../breadcrumb-item/breadcrumb-item.js';
import styles from './breadcrumbs.styles.js';
import {t} from '../../utilities/translate';
Comment thread
gcamacho079 marked this conversation as resolved.

type BreadcrumbItem = {
label?: string;
Expand All @@ -24,7 +25,7 @@ export default class CraftBreadcrumbs extends LitElement {
* The label to use for the breadcrumb control. This will not be shown on the screen, but it will be announced by
* screen readers and other assistive devices to provide more context for users.
*/
@property() label = '';
@property() label = t('Breadcrumbs');

@state()
private items: BreadcrumbItem[] = [];
Expand Down Expand Up @@ -127,10 +128,6 @@ export default class CraftBreadcrumbs extends LitElement {
override connectedCallback() {
super.connectedCallback();

if (!this.hasAttribute('role')) {
this.setAttribute('role', 'navigation');
}

this.resizeObserver = new ResizeObserver(() => {
if (this.firstRender) {
// Don't adjust overflow on first render, it is adjusted in slotChangeHandler
Expand Down
4 changes: 2 additions & 2 deletions packages/craftcms-cp/src/components/button/button.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ export const Icon: Story = {
render: (args) => html`
<div class="flex gap-2 items-center">
<craft-button icon>
<craft-icon name="location"></craft-icon>
<craft-icon name="location" label="Location"></craft-icon>
</craft-button>
<craft-button icon size="small">
<craft-icon name="location"></craft-icon>
<craft-icon name="location" label="Location"></craft-icon>
</craft-button>
</div>
`,
Expand Down
20 changes: 2 additions & 18 deletions packages/craftcms-cp/src/components/chip/chip.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,7 @@ export const PrefixAndSuffix: Story = {
<craft-status slot="prefix" status="live"></craft-status>
This is a chip
<craft-button icon size="small" appearance="plain" slot="suffix">
<span class="icon">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640">
<!--!Font Awesome Free v7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.-->
<path
fill="currentColor"
d="M96 320C96 289.1 121.1 264 152 264C182.9 264 208 289.1 208 320C208 350.9 182.9 376 152 376C121.1 376 96 350.9 96 320zM264 320C264 289.1 289.1 264 320 264C350.9 264 376 289.1 376 320C376 350.9 350.9 376 320 376C289.1 376 264 350.9 264 320zM488 264C518.9 264 544 289.1 544 320C544 350.9 518.9 376 488 376C457.1 376 432 350.9 432 320C432 289.1 457.1 264 488 264z"
/>
</svg>
</span>
<craft-icon name="ellipsis" label="Actions"></craft-icon>
</craft-button>
</craft-chip>
`,
Expand All @@ -59,15 +51,7 @@ export const SuffixOnly: Story = {
render: (args) => html`
<craft-chip>
<craft-button icon size="small" appearance="plain" slot="suffix">
<span class="icon">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640">
<!--!Font Awesome Free v7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.-->
<path
fill="currentColor"
d="M96 320C96 289.1 121.1 264 152 264C182.9 264 208 289.1 208 320C208 350.9 182.9 376 152 376C121.1 376 96 350.9 96 320zM264 320C264 289.1 289.1 264 320 264C350.9 264 376 289.1 376 320C376 350.9 350.9 376 320 376C289.1 376 264 350.9 264 320zM488 264C518.9 264 544 289.1 544 320C544 350.9 518.9 376 488 376C457.1 376 432 350.9 432 320C432 289.1 457.1 264 488 264z"
/>
</svg>
</span>
<craft-icon name="ellipsis" label="Actions"></craft-icon>
</craft-button>
This is a chip
</craft-chip>
Expand Down
Loading