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

Jump to bottom

Use 0 instead of none in OKLCH values #14741

Merged
merged 5 commits into from
Oct 21, 2024
Merged

Use 0 instead of none in OKLCH values #14741

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dcb6d4d
Use 0 instead of none in OKLCH values
adamwathan Oct 21, 2024
477beb4
Update integration tests
adamwathan Oct 21, 2024
44e001c
Use oklch for color-mix transparency stuff
adamwathan Oct 21, 2024
33ba015
Use simpler colors
adamwathan Oct 21, 2024
194d1e8
Update changelog
adamwathan Oct 21, 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
22 changes: 11 additions & 11 deletions integrations/upgrade/js-config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,17 +270,17 @@ test(
@import 'tailwindcss';

@theme {
--color-gray-50: oklch(0.985 0 none);
--color-gray-100: oklch(0.97 0 none);
--color-gray-200: oklch(0.922 0 none);
--color-gray-300: oklch(0.87 0 none);
--color-gray-400: oklch(0.708 0 none);
--color-gray-500: oklch(0.556 0 none);
--color-gray-600: oklch(0.439 0 none);
--color-gray-700: oklch(0.371 0 none);
--color-gray-800: oklch(0.269 0 none);
--color-gray-900: oklch(0.205 0 none);
--color-gray-950: oklch(0.145 0 none);
--color-gray-50: oklch(0.985 0 0);
--color-gray-100: oklch(0.97 0 0);
--color-gray-200: oklch(0.922 0 0);
--color-gray-300: oklch(0.87 0 0);
--color-gray-400: oklch(0.708 0 0);
--color-gray-500: oklch(0.556 0 0);
--color-gray-600: oklch(0.439 0 0);
--color-gray-700: oklch(0.371 0 0);
--color-gray-800: oklch(0.269 0 0);
--color-gray-900: oklch(0.205 0 0);
--color-gray-950: oklch(0.145 0 0);
}
"
`)
Expand Down
24 changes: 12 additions & 12 deletions packages/@tailwindcss-postcss/src/__snapshots__/index.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
--color-gray-800: oklch(.278 .033 256.848);
--color-gray-900: oklch(.21 .034 264.665);
--color-gray-950: oklch(.13 .028 261.692);
--color-zinc-50: oklch(.985 0 none);
--color-zinc-50: oklch(.985 0 0);
--color-zinc-100: oklch(.967 .001 286.375);
--color-zinc-200: oklch(.92 .004 286.32);
--color-zinc-300: oklch(.871 .006 286.286);
Expand All @@ -51,17 +51,17 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
--color-zinc-800: oklch(.274 .006 286.033);
--color-zinc-900: oklch(.21 .006 285.885);
--color-zinc-950: oklch(.141 .005 285.823);
--color-neutral-50: oklch(.985 0 none);
--color-neutral-100: oklch(.97 0 none);
--color-neutral-200: oklch(.922 0 none);
--color-neutral-300: oklch(.87 0 none);
--color-neutral-400: oklch(.708 0 none);
--color-neutral-500: oklch(.556 0 none);
--color-neutral-600: oklch(.439 0 none);
--color-neutral-700: oklch(.371 0 none);
--color-neutral-800: oklch(.269 0 none);
--color-neutral-900: oklch(.205 0 none);
--color-neutral-950: oklch(.145 0 none);
--color-neutral-50: oklch(.985 0 0);
--color-neutral-100: oklch(.97 0 0);
--color-neutral-200: oklch(.922 0 0);
--color-neutral-300: oklch(.87 0 0);
--color-neutral-400: oklch(.708 0 0);
--color-neutral-500: oklch(.556 0 0);
--color-neutral-600: oklch(.439 0 0);
--color-neutral-700: oklch(.371 0 0);
--color-neutral-800: oklch(.269 0 0);
--color-neutral-900: oklch(.205 0 0);
--color-neutral-950: oklch(.145 0 0);
--color-stone-50: oklch(.985 .001 106.423);
--color-stone-100: oklch(.97 .001 106.424);
--color-stone-200: oklch(.923 .003 48.717);
Expand Down
24 changes: 12 additions & 12 deletions packages/tailwindcss/src/__snapshots__/index.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using
--color-gray-800: oklch(.278 .033 256.848);
--color-gray-900: oklch(.21 .034 264.665);
--color-gray-950: oklch(.13 .028 261.692);
--color-zinc-50: oklch(.985 0 none);
--color-zinc-50: oklch(.985 0 0);
--color-zinc-100: oklch(.967 .001 286.375);
--color-zinc-200: oklch(.92 .004 286.32);
--color-zinc-300: oklch(.871 .006 286.286);
Expand All @@ -50,17 +50,17 @@ exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using
--color-zinc-800: oklch(.274 .006 286.033);
--color-zinc-900: oklch(.21 .006 285.885);
--color-zinc-950: oklch(.141 .005 285.823);
--color-neutral-50: oklch(.985 0 none);
--color-neutral-100: oklch(.97 0 none);
--color-neutral-200: oklch(.922 0 none);
--color-neutral-300: oklch(.87 0 none);
--color-neutral-400: oklch(.708 0 none);
--color-neutral-500: oklch(.556 0 none);
--color-neutral-600: oklch(.439 0 none);
--color-neutral-700: oklch(.371 0 none);
--color-neutral-800: oklch(.269 0 none);
--color-neutral-900: oklch(.205 0 none);
--color-neutral-950: oklch(.145 0 none);
--color-neutral-50: oklch(.985 0 0);
--color-neutral-100: oklch(.97 0 0);
--color-neutral-200: oklch(.922 0 0);
--color-neutral-300: oklch(.87 0 0);
--color-neutral-400: oklch(.708 0 0);
--color-neutral-500: oklch(.556 0 0);
--color-neutral-600: oklch(.439 0 0);
--color-neutral-700: oklch(.371 0 0);
--color-neutral-800: oklch(.269 0 0);
--color-neutral-900: oklch(.205 0 0);
--color-neutral-950: oklch(.145 0 0);
--color-stone-50: oklch(.985 .001 106.423);
--color-stone-100: oklch(.97 .001 106.424);
--color-stone-200: oklch(.923 .003 48.717);
Expand Down
24 changes: 12 additions & 12 deletions packages/tailwindcss/src/compat/colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default {
'950': 'oklch(0.13 0.028 261.692)',
},
zinc: {
'50': 'oklch(0.985 0 none)',
'50': 'oklch(0.985 0 0)',
'100': 'oklch(0.967 0.001 286.375)',
'200': 'oklch(0.92 0.004 286.32)',
'300': 'oklch(0.871 0.006 286.286)',
Expand All @@ -44,17 +44,17 @@ export default {
'950': 'oklch(0.141 0.005 285.823)',
},
neutral: {
'50': 'oklch(0.985 0 none)',
'100': 'oklch(0.97 0 none)',
'200': 'oklch(0.922 0 none)',
'300': 'oklch(0.87 0 none)',
'400': 'oklch(0.708 0 none)',
'500': 'oklch(0.556 0 none)',
'600': 'oklch(0.439 0 none)',
'700': 'oklch(0.371 0 none)',
'800': 'oklch(0.269 0 none)',
'900': 'oklch(0.205 0 none)',
'950': 'oklch(0.145 0 none)',
'50': 'oklch(0.985 0 0)',
'100': 'oklch(0.97 0 0)',
'200': 'oklch(0.922 0 0)',
'300': 'oklch(0.87 0 0)',
'400': 'oklch(0.708 0 0)',
'500': 'oklch(0.556 0 0)',
'600': 'oklch(0.439 0 0)',
'700': 'oklch(0.371 0 0)',
'800': 'oklch(0.269 0 0)',
'900': 'oklch(0.205 0 0)',
'950': 'oklch(0.145 0 0)',
},
stone: {
'50': 'oklch(0.985 0.001 106.423)',
Expand Down
24 changes: 12 additions & 12 deletions packages/tailwindcss/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
--color-gray-900: oklch(0.21 0.034 264.665);
--color-gray-950: oklch(0.13 0.028 261.692);

--color-zinc-50: oklch(0.985 0 none);
--color-zinc-50: oklch(0.985 0 0);
--color-zinc-100: oklch(0.967 0.001 286.375);
--color-zinc-200: oklch(0.92 0.004 286.32);
--color-zinc-300: oklch(0.871 0.006 286.286);
Expand All @@ -56,17 +56,17 @@
--color-zinc-900: oklch(0.21 0.006 285.885);
--color-zinc-950: oklch(0.141 0.005 285.823);

--color-neutral-50: oklch(0.985 0 none);
--color-neutral-100: oklch(0.97 0 none);
--color-neutral-200: oklch(0.922 0 none);
--color-neutral-300: oklch(0.87 0 none);
--color-neutral-400: oklch(0.708 0 none);
--color-neutral-500: oklch(0.556 0 none);
--color-neutral-600: oklch(0.439 0 none);
--color-neutral-700: oklch(0.371 0 none);
--color-neutral-800: oklch(0.269 0 none);
--color-neutral-900: oklch(0.205 0 none);
--color-neutral-950: oklch(0.145 0 none);
--color-neutral-50: oklch(0.985 0 0);
--color-neutral-100: oklch(0.97 0 0);
--color-neutral-200: oklch(0.922 0 0);
--color-neutral-300: oklch(0.87 0 0);
--color-neutral-400: oklch(0.708 0 0);
--color-neutral-500: oklch(0.556 0 0);
--color-neutral-600: oklch(0.439 0 0);
--color-neutral-700: oklch(0.371 0 0);
--color-neutral-800: oklch(0.269 0 0);
--color-neutral-900: oklch(0.205 0 0);
--color-neutral-950: oklch(0.145 0 0);

--color-stone-50: oklch(0.985 0.001 106.423);
--color-stone-100: oklch(0.97 0.001 106.424);
Expand Down