Skip to content
This repository was archived by the owner on May 15, 2025. It is now read-only.

fix: base component colors #82

Merged
clmntsnr merged 1 commit into from
Mar 7, 2025
Merged

fix: base component colors #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/components/extenders/Select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,28 @@ export const selectStyles = tv({
soft: {
base: "bg-main-0 text-main-11 border-1 border-main-0 hover:text-main-12 active:border-main-11",
icon: "border-main-0",
item: "hover:bg-main-5 data-[active-item]:bg-main-5 active:bg-main-4 text-main-12",
item: "font-text hover:bg-main-5 data-[active-item]:bg-main-5 active:bg-main-4 text-main-12",
},
base: {
base: "bg-main-0 text-main-11 border-1 border-main-9 hover:text-main-12 active:border-main-11",
icon: "border-main-0",
item: "hover:bg-main-5 data-[active-item]:bg-main-5 active:bg-main-4 text-main-12",
item: "font-text hover:bg-main-5 data-[active-item]:bg-main-5 active:bg-main-4 text-main-12",
},
bold: {
base: "bg-main-1 text-main-11 border-1 border-main-0 hover:text-main-12 active:border-main-8",
icon: "",
item: "hover:bg-main-5 data-[active-item]:bg-main-5 active:bg-main-4 text-main-12",
item: "font-text hover:bg-main-5 data-[active-item]:bg-main-5 active:bg-main-4 text-main-12",
check: "text-accent-10",
},
tint: {
base: "bg-main-5 text-main-11 border-1 border-main-0 hover:text-main-12 active:border-main-8",
icon: "",
item: "hover:bg-main-3 data-[active-item]:bg-main-6 active:bg-main-5 text-main-12",
item: "font-text hover:bg-main-3 data-[active-item]:bg-main-6 active:bg-main-5 text-main-12",
},
hype: {
base: "bg-main-8 text-main-12 border-1 border-main-0 hover:bg-main-10 active:border-stroke-11",
icon: "",
item: "hover:bg-accent-10 data-[active-item]:bg-accent-10 active:bg-accent-4 text-main-12",
item: "font-text hover:bg-accent-3 data-[active-item]:bg-accent-3 active:bg-accent-4 text-main-12",
},
},
size: {
Expand Down
4 changes: 2 additions & 2 deletions src/components/primitives/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export const buttonStyles = tv(
base: "flex items-center dim !leading-none select-none rounded-full disabled:opacity-60 disabled:pointer-events-none focus-visible:outline focus-visible:outline-main-12 font-text ease font-bold text-[clamp(15px,0.4167vw+0.78125rem,20px)]",
variants: {
look: {
soft: "bg-main-0 !p-0 text-accent-12 border-1 border-main-0 active:text-accent-11 disabled:text-main-11 outline-offset-4",
base: "bg-main-0 text-accent-12 border-1 border-accent-10 active:text-accent-11 disabled:border-main-11 disabled:text-accent-12",
soft: "bg-main-0 !p-0 text-main-12 border-1 border-main-0 active:text-accent-11 disabled:text-main-11 outline-offset-4",
base: "bg-main-0 text-main-12 border-1 border-accent-10 active:text-accent-11 disabled:border-main-11 disabled:text-accent-12",
bold: "bg-accent-10 text-accent-12 border-1 border-main-0 active:bg-accent-7 active:text-main-12 disabled:bg-main-11 disabled:text-accent-1",
tint: "bg-accent-7 text-accent-12 border-1 border-main-0 active:bg-accent-7 active:text-main-12 disabled:bg-main-11 disabled:text-accent-1",
hype: "bg-accent-11 text-accent-1 border-1 border-main-0 active:bg-accent-12 active:text-main-1 disabled:bg-main-11 disabled:text-accent-1",
Expand Down
10 changes: 5 additions & 5 deletions src/components/primitives/Input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ export const inputStyles = tv({
variants: {
look: {
none: "text-main-12 bg-main-0 border-0",
soft: "placeholder:text-main-11 text-main-12 bg-main-0 border-main-0 border-1 active:border-main-7 hover:text-main-11 focus-within:border-main-8",
base: "placeholder:text-main-11 text-main-11 bg-main-0 border-main-11 border-1 active:border-main-7 hover:text-main-11 focus-within:border-main-8",
bold: "placeholder:text-main-11 text-main-12 bg-main-2 border-main-0 border-1 active:border-main-7 hover:text-main-11 focus-within:border-main-8",
tint: "placeholder:text-main-11 text-main-12 bg-main-5 border-main-0 border-1 active:border-main-7 hover:text-main-11 focus-within:border-main-8",
hype: "placeholder:text-main-2 text-main-1 bg-main-12 border-main-0 border-1 active:border-accent-9 hover:text-main-2 focus-within:border-main-8",
soft: "placeholder:items-center placeholder:text-main-11 text-main-12 bg-main-0 border-main-0 border-1 active:border-main-7 hover:text-main-11 focus-within:border-main-8",
base: "placeholder:items-center placeholder:text-main-11 text-main-11 bg-main-0 border-main-11 border-1 active:border-main-7 hover:text-main-11 focus-within:border-main-8",
bold: "placeholder:items-center placeholder:text-main-11 text-main-12 bg-main-2 border-main-0 border-1 active:border-main-7 hover:text-main-11 focus-within:border-main-8",
tint: "placeholder:items-center placeholder:text-main-11 text-main-12 bg-main-5 border-main-0 border-1 active:border-main-7 hover:text-main-11 focus-within:border-main-8",
hype: "placeholder:items-center placeholder:text-main-2 text-main-1 bg-main-12 border-main-0 border-1 active:border-accent-9 hover:text-main-2 focus-within:border-main-8",
},
size: {
xs: "px-xs py-xs text-xs rounded-xs",
Expand Down
4 changes: 2 additions & 2 deletions src/components/primitives/PrimitiveTag.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export const primitiveTagStyles = tv({
base: "flex items-center select-none !leading-none rounded-full text-nowrap ease focus-visible:outline focus-visible:outline-dashed focus-visible:outline-main-12 font-text font-bold text-[clamp(15px,0.4167vw+0.78125rem,20px)]",
variants: {
look: {
soft: "text-accent-12 bg-transparent border-1 border-main-9",
base: "text-accent-12 bg-main-5",
soft: "text-main-12 bg-transparent border-1 border-main-9",
base: "text-main-12 bg-main-5",
bold: "text-main-12 bg-main-8",
tint: "text-accent-1 bg-main-11",
hype: "text-accent-1 bg-accent-11",
Expand Down
2 changes: 1 addition & 1 deletion src/theming/tailwind.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export function generateVariableAssigners(): TailwindConfig["theme"] {
return {
colors: {
main: { 0: "transparent", ...generateColorScale("main") },
background: "rgb(var(--background) / <alpha-value>)",
background: "rgb(var(--background))",
accent: { 0: "transparent", ...generateColorScale("accent") },
},
borderRadius: generateRadiusScale("radius"),
Expand Down