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

feat(front): change header logo & selects #33

Merged
merged 2 commits into from
Dec 16, 2024
Merged

feat(front): change header logo & selects #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6624ef0
add imgClassName
indaviande Dec 16, 2024
f0ae6d4
change selects
indaviande Dec 16, 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
12 changes: 6 additions & 6 deletions src/components/extenders/Select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import Group from "./Group";

export const selectStyles = tv({
base: [
"text-main-11 rounded-sm flex items-center dim focus-visible:outline-main-12 !leading-none justify-between text-nowrap font-text font-semibold",
"rounded-sm ease flex items-center focus-visible:outline-main-12 !leading-none justify-between text-nowrap font-text font-semibold",
],
slots: {
dropdown: "outline-0 z-50 origin-top animate-drop animate-stretch mt-sm min-w-[var(--popover-anchor-width)]",
Expand All @@ -27,28 +27,28 @@ export const selectStyles = tv({
variants: {
look: {
soft: {
base: "bg-main-0 active:text-main-12 text-main-11",
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",
},
base: {
base: "bg-main-0 border-main-9 border-1 active:text-main-12 text-main-11",
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",
},
bold: {
base: "bg-main-1 active:text-main-12 text-main-11",
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",
check: "text-accent-10",
},
tint: {
base: "bg-main-5 active:text-main-12 text-main-11",
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",
},
hype: {
base: "bg-accent-5 active:text-main-12 text-accent-11",
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",
},
Expand Down
5 changes: 3 additions & 2 deletions src/components/primitives/Image.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ import type { Component } from "../../utils/types";

export type ImageProps = Component<
{
imgClassName?: string;
fallback?: string;
},
HTMLImageElement
>;

export default function Image({ fallback, className, ...props }: ImageProps) {
export default function Image({ fallback, imgClassName, className, ...props }: ImageProps) {
return (
<Avatar.Root className={mergeClass(className)}>
<Avatar.Image {...props} style={{ ...props.style, width: "100%", height: "100%" }} />
<Avatar.Image className={imgClassName} {...props} style={{ ...props.style, width: "100%", height: "100%" }} />
<Avatar.Fallback
data-link={props.src}
className="bg-main-7 h-full w-full text-auto justify-center flex items-center rounded-full p-sm"
Expand Down
Loading