Skip to content

dropdown wip #20

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

Draft
gelicamarie wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

dropdown wip #20

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
c4b94d5
fix member card hover
gelicamarie Jul 14, 2023
80188ed
wip
gelicamarie Jul 15, 2023
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
4 changes: 2 additions & 2 deletions packages/components/node_modules/.bin/sb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/components/node_modules/.bin/storybook
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/components/node_modules/.bin/tsup
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/components/node_modules/.bin/tsup-node
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/components/node_modules/.bin/vite
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion packages/components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
},
"homepage": "https://github.com/0xStation/ui-components#readme",
"dependencies": {
"@radix-ui/react-dialog": "^1.0.4"
"@radix-ui/react-dialog": "^1.0.4",
"@radix-ui/react-dropdown-menu": "^2.0.5"
}
}
2 changes: 1 addition & 1 deletion packages/components/src/Modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { Root, Trigger, Portal, Overlay, Content, Close } from '@radix-ui/react-dialog'
import { Root, Portal, Overlay, Content, Close } from '@radix-ui/react-dialog'
import { Close as CloseIcon } from '../icons/Close'
import { cn } from '../lib/utils'
import { cva } from 'class-variance-authority'
Expand Down
16 changes: 8 additions & 8 deletions packages/components/src/card/MemberCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const MembersCard = ({
title,
subText,
image,
hoverEffect,
hoverEffect = false,
}: {
title: string
subText?: string
Expand All @@ -26,14 +26,14 @@ export const MembersCard = ({
image
)
return (
<div className="ui-flex ui-flex-col ui-w-full ui-max-w-[257px] ui-gap-2 md:ui-gap-3 group hover:ui-bg-wet-concrete90 ui-rounded-lg ui-p-2">
<div
className={clsx(
'ui-flex ui-flex-col ui-w-full ui-max-w-[257px] ui-gap-2 md:ui-gap-3 hover:ui-bg-wet-concrete90 ui-rounded-lg ui-p-2',
hoverEffect && 'hover:[&_img]:ui-scale-125',
)}
>
<div className="ui-w-full ui-max-w-[241px] ui-overflow-hidden ui-rounded-md ui-relative ui-aspect-square">
<div
className={clsx(
'ui-bg-wet-concrete90 ui-w-full ui-transition-all ui-duration-300 ui-aspect-square',
hoverEffect && 'group-hover:ui-scale-125 ',
)}
>
<div className="ui-bg-wet-concrete90 ui-w-full [&_img]:ui-transition-all [&_img]:ui-duration-300 ui-aspect-square">
{img}
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions packages/components/src/dropdown/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import React from "react";
import { Root, Portal, Trigger, Content, Item } from "@radix-ui/react-dropdown-menu";
Loading