Skip to content

VL_New-tailwind-colors_Vitalii-Dudnik #682

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

Merged
itsJohnnyGrid merged 6 commits into from
Jun 30, 2026
Merged

VL_New-tailwind-colors_Vitalii-Dudnik #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e9dc381
feat: expand NEUTRAL_COLORS and update type definitions to include ne…
KinduD21 Jun 30, 2026
a0c2089
feat: add eslint-plugin-tailwindcss for improved Tailwind CSS support
KinduD21 Jun 30, 2026
4ea84f2
fix: add eslint-disable comments for tailwindcss rule violations in U…
KinduD21 Jun 30, 2026
df8a194
refactor: remove unnecessary eslint-disable comments and update Tailw…
KinduD21 Jun 30, 2026
ab7ac75
refactor: clear tailwindcss plugin functions list in eslint config
KinduD21 Jun 30, 2026
40d76ef
refactor: add classNames function to tailwindcss plugin settings in e…
KinduD21 Jun 30, 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
12 changes: 11 additions & 1 deletion eslint.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import prettierEslintConfig from "@vue/eslint-config-prettier";
import pluginVue from "eslint-plugin-vue";
import pluginVitest from "@vitest/eslint-plugin";
import pluginStorybook from "eslint-plugin-storybook";
import pluginTailwindcss from "eslint-plugin-tailwindcss";

const languageOptions = {
globals: {
Expand All @@ -31,6 +32,16 @@ export default defineConfigWithVueTs(
})),
vueTsConfigs.recommended,
prettierEslintConfig,
{
...pluginTailwindcss.configs.recommended,
files: ["**/*.{js,ts,vue}"],
settings: {
tailwindcss: {
cssConfigPath: "./src/tailwind.css",
functions: ["classNames"],
},
},
},
{
name: "common",
languageOptions,
Expand Down Expand Up @@ -66,7 +77,6 @@ export default defineConfigWithVueTs(
},
},
{
name: "vitest",
Comment thread
itsJohnnyGrid marked this conversation as resolved.
files: ["src/**/tests/*"],
...pluginVitest.configs.recommended,
},
Expand Down
70 changes: 70 additions & 0 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.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"@vueless/storybook": "^1.6.6",
"eslint": "^10.2.1",
"eslint-plugin-storybook": "^10.3.5",
"eslint-plugin-tailwindcss": "^4.0.0-alpha.7",
"eslint-plugin-vue": "^10.9.0",
"globals": "^17.5.0",
"jsdom": "^29.0.2",
Expand Down
12 changes: 11 additions & 1 deletion src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,17 @@ export const STATE_COLORS = [
GRAYSCALE_COLOR,
];
export const LAYOUT_COLORS = ["text", "border", "bg"];
export const NEUTRAL_COLORS = ["slate", "gray", "zinc", "neutral", "stone"];
export const NEUTRAL_COLORS = [
"slate",
"gray",
"zinc",
"neutral",
"stone",
"mauve",
"olive",
"mist",
"taupe",
];
export const COLOR_SHADES = [50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 950];

export const DEFAULT_LIGHT_THEME = {
Expand Down
12 changes: 11 additions & 1 deletion src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,17 @@ export interface ColorShades {
950: string;
}

export type NeutralColorName = "slate" | "gray" | "zinc" | "neutral" | "stone" | string;
export type NeutralColorName =
| "slate"
| "gray"
| "zinc"
| "neutral"
| "stone"
| "mauve"
| "olive"
| "mist"
| "taupe"
| string;
export type PrimaryColorName =
| "red"
| "orange"
Expand Down
4 changes: 4 additions & 0 deletions src/ui.other-theme-color-toggle/storybook/stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ export default {
zinc: "bg-zinc-600",
neutral: "bg-neutral-600",
stone: "bg-stone-600",
mauve: "bg-mauve-600",
olive: "bg-olive-600",
mist: "bg-mist-600",
taupe: "bg-taupe-600",
},
},
argTypes: {
Expand Down