Skip to content

update shared-ui and remove duplicated color theme definitions #320

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
chmurson merged 3 commits into from
Oct 3, 2025
Merged

update shared-ui and remove duplicated color theme definitions #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea73e63
chore: re-use theme variables from shared-ui
chmurson Oct 2, 2025
10083f0
chore: update share-uid to v0.3.1
chmurson Oct 3, 2025
8fd8fb5
fix: css import order
chmurson Oct 3, 2025
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
8 changes: 4 additions & 4 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 @@ -19,7 +19,7 @@
},
"dependencies": {
"@fluffylabs/migrate-selection": "^1.0.0",
"@fluffylabs/shared-ui": "^0.2.0",
"@fluffylabs/shared-ui": "^0.3.1",
"@fluffylabs/synctex-store": "^1.0.0",
"@radix-ui/react-dropdown-menu": "^2.1.15",
"@radix-ui/react-popover": "^1.1.14",
Expand Down
48 changes: 1 addition & 47 deletions src/tailwind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*@source "../node_modules/@fluffylabs/shared-ui/dist/";*/
@import "tailwindcss";
@custom-variant dark (&:where(.dark, .dark *));
@import "@fluffylabs/shared-ui/theme.css";

@theme{
--animate-fade-in: fade-in 0.75s ease-in forwards;
Expand All @@ -10,48 +9,3 @@
to { opacity: 1 }
}
}

@theme {
/* Custom TailwindCSS colors redefinition from @fluffylabs/shared-ui */
/* Since all the colors defined in @fluffylabs/shared-ui are not included in the final bundle of @fluffy-labs/share-ui, we need to redefine them here manually. Not all of these colors are not used by components of shared-ui. */

--color-title-foreground: var(--title-foreground);
--color-title: var(--title);
--color-title-secondary-foreground: var(--title-secondary-foreground);

--color-brand: var(--brand);
--color-brand-dark: var(--brand-dark);
--color-brand-darkest: var(--brand-darkest);
--color-brand-very-dark: var(--brand-very-dark);
--color-brand-light: var(--brand-light);
--color-brand-very-light: var(--brand-very-light);

--color-background: var(--background);
--color-foreground: var(--foreground);
--color-card: var(--card);
--color-card-foreground: var(--card-foreground);
--color-popover: var(--popover);
--color-popover-foreground: var(--popover-foreground);

--color-secondary-foreground: var(--secondary-foreground);
--color-secondary: var(--secondary);
--color-primary-foreground: var(--primary-foreground);
--color-primary: var(--primary);

--color-muted: var(--muted);
--color-muted-foreground: var(--muted-foreground);
--color-accent: var(--accent);
--color-accent-foreground: var(--accent-foreground);

--color-destructive: var(--destructive);
--color-destructive-foreground: var(--destructive-foreground);

--color-border: var(--border);
--color-input: var(--input);
--color-ring: var(--ring);

--color-sidebar: var(--sidebar);
--color-sidebar-darker: var(--sidebar-darker);
--color-sidebar-foreground: var(--sidebar-foreground);
--color-sidebar-foreground-muted: var(--sidebar-foreground-muted);
}