diff --git a/src/assets/icon/common/uploadImg.svg b/src/assets/icon/common/uploadImg.svg index 37c18ee5..98740532 100644 --- a/src/assets/icon/common/uploadImg.svg +++ b/src/assets/icon/common/uploadImg.svg @@ -1,3 +1,3 @@ diff --git a/src/components/common/button/Button.tsx b/src/components/common/button/Button.tsx index 16b8f0c2..5b96b782 100644 --- a/src/components/common/button/Button.tsx +++ b/src/components/common/button/Button.tsx @@ -36,13 +36,13 @@ export default function Button({ const variantClasses = { primary: - "bg-chart-3 text-white hover:opacity-80 disabled:bg-bg-disabled disabled:text-text-disabled disabled:hover:opacity-50", + "bg-chart-3 text-white hover:bg-[#0e6add] disabled:bg-bg-disabled disabled:text-text-disabled disabled:hover:bg-bg-disabled", secondary: - "bg-gray-100 text-brand-900 hover:bg-gray-200 disabled:bg-bg-disabled disabled:text-text-disabled disabled:hover:opacity-50 disabled:hover:opacity-50", + "bg-gray-100 text-brand-900 hover:bg-gray-200 disabled:bg-bg-disabled disabled:text-text-disabled disabled:hover:bg-bg-disabled", outline: - "bg-transparent border border-chart-3 text-chart-3 hover:bg-brand-300 disabled:border-gray-300 disabled:text-text-disabled disabled:hover:bg-transparent", + "bg-transparent border border-chart-3 text-chart-3 hover:bg-chart-3/5 disabled:border-gray-300 disabled:text-text-disabled disabled:hover:bg-transparent", danger: - "bg-status-red text-white hover:opacity-80 disabled:bg-bg-disabled disabled:text-text-disabled disabled:hover:opacity-50", + "bg-status-red text-white hover:bg-[#d91632] disabled:bg-bg-disabled disabled:text-text-disabled disabled:hover:bg-bg-disabled", dangerSoft: "bg-status-red/10 text-status-red border border-status-red hover:bg-status-red/20 disabled:bg-bg-disabled disabled:text-text-disabled disabled:border-gray-300 disabled:hover:bg-bg-disabled", gradient: diff --git a/src/components/common/dropdownmenu/DropdownMenu.tsx b/src/components/common/dropdownmenu/DropdownMenu.tsx index 896adf9e..e8abf297 100644 --- a/src/components/common/dropdownmenu/DropdownMenu.tsx +++ b/src/components/common/dropdownmenu/DropdownMenu.tsx @@ -57,7 +57,7 @@ export function DropdownMenu({
)} diff --git a/src/components/workspace/WorkspaceCard.tsx b/src/components/workspace/WorkspaceCard.tsx index f13d8854..6269608e 100644 --- a/src/components/workspace/WorkspaceCard.tsx +++ b/src/components/workspace/WorkspaceCard.tsx @@ -4,28 +4,16 @@ import { twMerge } from "tailwind-merge"; import type { TWorkspace } from "@/types/workspace/workspace"; import { ROLE_LABEL_MAP } from "@/constants/workspaceRole"; -import { - DropdownMenu, - type TMenuItem, -} from "@/components/common/dropdownmenu/DropdownMenu"; - import BuildingIcon from "@/assets/icon/common/building.svg?react"; -import VectorIcon from "@/assets/icon/common/more.svg?react"; import { getImageUrl } from "@/lib/getImageUrl"; type TProps = { workspace: TWorkspace; - menuItems: TMenuItem[]; isSelected?: boolean; onClick?: () => void; }; -function WorkspaceCard({ - workspace: w, - menuItems, - isSelected = false, - onClick, -}: TProps) { +function WorkspaceCard({ workspace: w, isSelected = false, onClick }: TProps) { const [imageError, setImageError] = useState(false); useEffect(() => { @@ -36,68 +24,61 @@ function WorkspaceCard({ const showPlaceholder = !imageSrc || imageError; return ( -- 워크스페이스 목록을 불러오는 중입니다. -
-
- 워크스페이스를 생성한 사용자는 자동으로 관리자 권한을 갖습니다.{" "}
-
로고 이미지와 기본 정보를 입력해 주세요.
+
+ 워크스페이스를 생성한 사용자는 자동으로 관리자 권한을 갖습니다.
+
+ 로고 이미지와 기본 정보를 입력해 주세요.
{createErrorMsg}
)}불러오는중..
@@ -214,10 +196,6 @@ export default function WorkspaceSetting() { {!loading && !errorMsg && ( <>- 워크스페이스의 대표적인 정보를 설정합니다. -