Skip to content
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

Small buttons update #1608

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+50 −24
Open

Small buttons update #1608

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a414e96
update: use cva for variants & made all buttons full rounded
SvMak Dec 14, 2024
cb0ccf2
Merge branch 'main' into update-buttons
SvMak Dec 17, 2024
ece3ef3
Merge branch 'main' into update-buttons
SvMak Dec 22, 2024
c7c293d
Merge branch 'main' into update-buttons
SvMak Dec 24, 2024
7dc84ce
change: rounded buttons
SvMak Dec 29, 2024
bb2862d
add: hover colors
SvMak Dec 29, 2024
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
11 changes: 11 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 @@ -30,6 +30,7 @@
"astro": "^5.1.1",
"astro-icon": "^1.1.4",
"astro-seo": "^0.8.4",
"class-variance-authority": "^0.7.1",
"htmx.org": "^2.0.4",
"markdown-it": "^14.0.0",
"node-html-parser": "^6.1.13",
Expand Down
57 changes: 33 additions & 24 deletions src/components/ui/Button.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,30 @@
---
import SHA from './SHA.astro';
import { cva, type VariantProps } from 'class-variance-authority';

interface Props {
color?: 'orange' | 'green' | 'lightblue' | 'semidarkblue';
size?: 'sm' | 'lg' | 'lg-full' | 'sm-mobfull';
import SHA from '@/components/ui/SHA.astro';
import Link from '@/components/util/Link.astro';

export const buttonVariants = cva(
'font-bold text-white drop-shadow transition-colors rounded-full text-center',
Copy link
Collaborator

@thilobillerbeck thilobillerbeck Dec 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fully rounded corners are an interesting design change, though I'm not really a fan of it, this comes especially into play when seeing how buttons behave inside cards as seen on the learn site. The fully rounded corners do not really seem to fit into the more boxy card shape, while the old design aligns more with its parent design and at least in my opinion looks more coherent.

{
variants: {
color: {
orange: 'bg-nix-orange hover:bg-nix-orange-hover',
lightblue: 'bg-nix-blue-light hover:bg-nix-blue-light-hover',
semidarkblue: 'bg-nix-blue-dark hover:bg-nix-blue-dark-hover',
green: 'bg-nix-green hover:bg-nix-green-hover',
Comment on lines +12 to +15
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my testing I couldn't really tell how the hover state applied, am I missing something or is it just to subtile? I'd guess the mentioned colors may need to be defined first. :D

},
size: {
sm: 'px-10 py-2.5',
'sm-mobfull': 'px-8 py-2.5 md:w-auto w-full',
lg: 'px-10 py-2.5 md:px-14 md:py-4 w-full md:w-auto',
'lg-full': 'px-10 py-4 block',
},
},
},
);

interface Props extends VariantProps<typeof buttonVariants> {
href?: string | null;
type?: 'button' | 'submit' | 'reset';
classList?: string[];
Expand All @@ -13,20 +34,6 @@ interface Props {
label?: string;
}

const colorMap = {
orange: 'bg-nix-orange',
lightblue: 'bg-nix-blue-light',
semidarkblue: 'bg-nix-blue-dark',
green: 'bg-nix-green',
};

const sizeMap = {
sm: 'px-10 py-2.5 rounded-3xl text-center',
'sm-mobfull': 'px-8 py-2.5 rounded-3xl md:w-auto w-full text-center',
lg: 'px-10 py-2.5 md:px-14 md:py-4 rounded-full md:rounded-2xl text-center w-full md:w-auto',
'lg-full': 'text-center py-4 block rounded-2xl',
};

const {
color = 'orange',
size = 'sm',
Expand All @@ -38,27 +45,29 @@ const {
shaText = '',
label,
} = Astro.props;

const localClassList = `${colorMap[color]} font-bold ${sizeMap[size]} text-white drop-shadow`;
---

{
href ? (
<>
<a
<Link
href={href}
class:list={['!text-white !no-underline', localClassList, classList]}
class:list={[
'!text-white !no-underline',
buttonVariants({ color, size }),
classList,
]}
>
{label || <slot />}
</a>
</Link>
{shaHref && (
<SHA href={shaHref} classList={shaClassList}>
{shaText}
</SHA>
)}
</>
) : (
<button type={type} class={localClassList}>
<button type={type} class={buttonVariants({ color, size })}>
<slot />
</button>
)
Expand Down
Loading