DHBW-WE/MeetUp
5
0
Fork 0
Code Issues 7 Pull requests 5 Projects 1 Releases 5 Packages 1 Wiki Activity Actions

feat: update button variants and styles for improved consistency and accessibility

Browse source
This commit is contained in:
Maximilian Liebmann 2025-05-30 19:46:43 +02:00
parent 749da6b8b0
commit 243df628a8
6 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/login/page.tsx
View file

@ -57,7 +57,7 @@ export default async function LoginPage() {
</div>
</div>
<HoverCard>
<HoverCardTrigger className='text-sm text-neutral-000 hover:underline'>
<HoverCardTrigger>
<Button variant='link'>made with love</Button>
</HoverCardTrigger>
<HoverCardContent className='flex items-center justify-center'>

25
src/components/custom-ui/button.tsx
View file

@ -5,24 +5,29 @@ import { cva, type VariantProps } from 'class-variance-authority';
import { cn } from '@/lib/utils';
const buttonVariants = cva(
"radius-lg inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-label transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
"radius-lg inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-button transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
{
variants: {
variant: {
primary:
'bg-primary text-text shadow-xs hover:bg-hover-primary active:bg-active-primary',
'bg-primary text-text shadow-xs hover:bg-hover-primary active:bg-active-primary disabled:bg-disabled-primary',
secondary:
'bg-secondary text-text-alt shadow-xs hover:bg-hover-secondary active:bg-active-secondary',
outline:
'border-2 border-primary bg-transparent text-text shadow-xs hover:bg-primary hover:border-neutral-000 hover:border-1.5 hover:text-neutral-000 active:bg-active-primary',
ghost:
'hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50',
'bg-secondary text-text-alt shadow-xs hover:bg-hover-secondary active:bg-active-secondary disabled:bg-disabled-secondary',
muted:
'bg-muted text-text shadow-xs hover:bg-hover-muted active:bg-active-muted disabled:bg-disabled-muted',
outline_primary:
'bg-background border-2 text-text shadow-xs hover:bg-primary border-primary hover:border-background-reversed active:bg-active-primary disabled:bg-disabled-primary',
outline_secondary:
'bg-background border-2 text-text shadow-xs hover:bg-secondary border-secondary hover:border-background-reversed active:bg-active-secondary disabled:bg-disabled-secondary',
outline_muted:
'bg-background border-2 text-text shadow-xs hover:bg-muted border-muted hover:border-background-reversed active:bg-active-muted disabled:bg-disabled-muted',
link: 'text-text underline-offset-4 hover:underline',
},
size: {
default: 'h-9 px-4 py-2 has-[>svg]:px-3',
sm: 'h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5',
lg: 'h-10 rounded-md px-6 has-[>svg]:px-4',
sm: 'h-8 gap-1.5 px-3 has-[>svg]:px-2.5',
lg: 'h-10 px-6 has-[>svg]:px-4',
icon: 'size-9',
},
},
@ -34,7 +39,7 @@ const buttonVariants = cva(
);
function Button({
className = 'font-label',
className,
variant,
size,
asChild = false,

2
src/components/labeled-input.tsx
View file

@ -15,7 +15,7 @@ export default function LabeledInput({
name?: string;
}) {
return (
<div className='grid grid-cols-1 gap-1 font-label'>
<div className='grid grid-cols-1 gap-1'>
<Label htmlFor={name}>{label}</Label>
<Input

2
src/components/user/login-form.tsx
View file

@ -38,7 +38,7 @@ export default function LoginForm() {
<Button type='submit' variant='primary'>
Login
</Button>
<Button type='submit' variant='outline'>
<Button type='submit' variant='outline_primary'>
Sign Up
</Button>
</div>

2
src/components/user/sso-login-button.tsx
View file

@ -11,7 +11,7 @@ export default function SSOLogin({
}) {
return (
<form
className='flex flex-col items-center gap-4 w-full'
className='flex flex-col items-center w-full'
action={async () => {
'use server';
await signIn(provider);

2
src/components/user/theme-picker.tsx
View file

@ -18,7 +18,7 @@ export function ThemePicker() {
return (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant='outline' size='icon'>
<Button variant='outline_primary' size='icon'>
<Sun className='h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0' />
<Moon className='absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100' />
<span className='sr-only'>Toggle theme</span>