diff --git a/bun.lockb b/bun.lockb index ffd0b54b..8b14e6b3 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index c43a8754..dc2164d3 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@sveltejs/kit": "^2.42.2", "@sveltejs/vite-plugin-svelte": "^4.0.4", "@tailwindcss/container-queries": "^0.1.1", - "@tailwindcss/postcss": "^4.1.13", + "@tailwindcss/vite": "^4.1.13", "@types/nprogress": "^0.2.3", "@types/ua-parser-js": "^0.7.39", "@xylightdev/svelte-hero-icons": "^2.2.7", @@ -27,7 +27,6 @@ "marked-linkify-it": "^3.1.13", "nprogress": "^0.2.0", "openapi-fetch": "^0.14.0", - "postcss": "^8.5.6", "prettier": "^3.6.2", "prettier-plugin-svelte": "^3.4.0", "svelte": "^5.39.2", diff --git a/postcss.config.js b/postcss.config.js deleted file mode 100644 index a7f73a2d..00000000 --- a/postcss.config.js +++ /dev/null @@ -1,5 +0,0 @@ -export default { - plugins: { - '@tailwindcss/postcss': {}, - }, -} diff --git a/src/style/app.css b/src/app.css similarity index 100% rename from src/style/app.css rename to src/app.css diff --git a/src/lib/components/ui/navbar/NavButton.svelte b/src/lib/components/ui/navbar/NavButton.svelte index 2a4292cc..7d2aea10 100644 --- a/src/lib/components/ui/navbar/NavButton.svelte +++ b/src/lib/components/ui/navbar/NavButton.svelte @@ -32,25 +32,19 @@ + + diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte index 0f166587..42a3fa9a 100644 --- a/src/lib/mono/button/Button.svelte +++ b/src/lib/mono/button/Button.svelte @@ -10,19 +10,14 @@ } export const buttonColor = { - primary: `border border-transparent bg-primary-900 text-slate-50 dark:bg-primary-100 dark:text-black`, - secondary: `border border-slate-200 border-b-slate-300 dark:border-zinc-800 bg-white dark:bg-zinc-900`, - tertiary: - ' bg-transparent hover:bg-slate-200/50 dark:hover:bg-zinc-700/30 dark:text-zinc-200', - - danger: - 'border border-red-500 bg-red-500 hover:text-red-500 hover:bg-transparent text-white', + primary: 'btn-primary', + secondary: 'btn-secondary', + tertiary: 'btn-tertiary', + danger: 'btn-danger', + ghost: 'btn-ghost', 'danger-subtle': 'text-red-500 hover:bg-red-500 hover:text-inherit!', 'success-subtle': 'text-green-500 hover:bg-green-500 hover:text-inherit!', 'warning-subtle': 'text-yellow-500 hover:bg-yellow-500 hover:text-inherit!', - ghost: `border border-slate-200 dark:border-zinc-800 bg-transparent - hover:bg-slate-100 dark:hover:bg-zinc-800 dark:hover:border-zinc-700 dark:text-zinc-400 hover:text-inherit - dark:hover:text-inherit`, 'blue-subtle': `text-blue-500 hover:bg-blue-500 hover:text-inherit!`, none: '', @@ -36,15 +31,15 @@ export type ButtonSize = keyof typeof buttonSize export const buttonSize = { - xs: 'px-2 py-1 text-xs', - sm: 'px-3 py-1.5 text-[12px]', - md: 'px-3 py-1.5 text-sm', - lg: 'px-4 py-2 text-sm', - xl: 'px-6 py-3 text-base', - 'square-sm': 'w-6 h-6', - 'square-md': 'w-8 h-8', - 'square-lg': 'w-10 h-10', - 'square-xl': 'w-12 h-12', + xs: 'btn-xs', + sm: 'btn-sm', + md: 'btn-md', + lg: 'btn-lg', + xl: 'btn-xl', + 'square-sm': 'btn-square-sm', + 'square-md': 'btn-square-md', + 'square-lg': 'btn-square-lg', + 'square-xl': 'btn-square-xl', custom: '', } @@ -61,6 +56,7 @@ extends Omit { loading?: boolean submit?: boolean + type?: 'button' | 'none' color?: ButtonColor size?: ButtonSize rounding?: ButtonRoundness @@ -93,6 +89,7 @@ let { loading = false, submit = false, + type = 'button', color = 'secondary', size = 'md', rounding = 'xl', @@ -117,15 +114,13 @@ {...rest} tabindex={disabled ? -1 : undefined} class={[ + type == 'button' && 'btn', buttonSize[size], buttonRounding[rounding], buttonShadow[shadow], buttonColor[color], buttonAlignment[alignment], - 'transition-all font-medium cursor-pointer disabled:opacity-50 disabled:pointer-events-none', - 'hover:brightness-98 hover:dark:brightness-95 active:brightness-90 active:dark:brightness-85 text-sm', - 'flex flex-row items-center gap-1.5', - (disabled || loading) && 'pointer-events-none opacity-50 shadow-none', + (disabled || loading) && 'btn-disabled', alignment == 'center' ? 'origin-center' : alignment == 'left' @@ -157,3 +152,164 @@ @slot `prefix` -- Will be replaced if `loading` is `true`. @slot `suffix` --> + + diff --git a/src/lib/mono/forms/select/Select.svelte b/src/lib/mono/forms/select/Select.svelte index abeb385e..bbcfb160 100644 --- a/src/lib/mono/forms/select/Select.svelte +++ b/src/lib/mono/forms/select/Select.svelte @@ -3,8 +3,7 @@ value?: T | string | undefined placeholder?: string | undefined label?: string | undefined - size?: ButtonSize - shadow?: ButtonShadow + size?: 'md' | 'sm' id?: string class?: ClassValue baseClass?: ClassValue @@ -35,7 +34,7 @@