diff --git a/.vscode/settings.json b/.vscode/settings.json index 127360469..c411a2d66 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -26,5 +26,9 @@ ["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"], ["clsx\\(([^]*)\\)", "(?:'|\"|`)([^\"'`]*)(?:'|\"|`)"], ["(?:twMerge|twJoin)\\(([^;]*)[\\);]", "[`'\"`]([^'\"`;]*)[`'\"`]"] - ] + ], + + "files.associations": { + "*.css": "tailwindcss" + } } diff --git a/src/components/config/styles/buttons.ts b/src/components/config/styles/buttons.ts index 0ba796b56..ff530f5f6 100644 --- a/src/components/config/styles/buttons.ts +++ b/src/components/config/styles/buttons.ts @@ -9,7 +9,7 @@ type ButtonConfigType = { const BUTTON_CONFIG: ButtonConfigType = { NOT_ACTIVE_CLASSNAME: - 'text-white text-opacity-75 dark:text-opacity-100 dark:text-muted-foreground bg-transparent focus:bg-accent hover:bg-accent focus:text-black hover:text-black dark:hover:text-primary-foreground dark:focus:text-primary-foreground', + 'text-inherit text-opacity-75 dark:text-opacity-100 dark:text-muted-foreground bg-transparent focus:bg-accent hover:bg-accent focus:text-black hover:text-black dark:hover:text-primary-foreground dark:focus:text-primary-foreground', ACTIVE_CLASSNAME: 'bg-primary text-primary-foreground', CLASSNAME: 'font-bold' } as const; diff --git a/src/components/layouts/dashboard/DashboardSidebar.tsx b/src/components/layouts/dashboard/DashboardSidebar.tsx index 4407b131d..e0f20d507 100644 --- a/src/components/layouts/dashboard/DashboardSidebar.tsx +++ b/src/components/layouts/dashboard/DashboardSidebar.tsx @@ -108,7 +108,7 @@ const DashboardSidebar: FunctionComponent = () => { className={'z-20 w-full justify-center border-t-[1px] border-muted-foreground bg-black dark:bg-card lg:w-fit lg:border-0'} ref={sidebarRef} > -