diff --git a/src/assets/icon/workspace/building.svg b/src/assets/icon/workspace/building.svg index cd3534c..a514969 100644 --- a/src/assets/icon/workspace/building.svg +++ b/src/assets/icon/workspace/building.svg @@ -1,3 +1,3 @@ - + diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx index 627a196..03dfb4e 100644 --- a/src/components/Sidebar/Sidebar.tsx +++ b/src/components/Sidebar/Sidebar.tsx @@ -14,19 +14,19 @@ import CollapseIcon from "@/assets/icon/sidebar/chevron-left.svg?react"; function getMainItemClass(isActive: boolean, isCollapsed: boolean) { return twMerge( - "flex items-center rounded-xl px-3 text-sm cursor-pointer transition-colors duration-200", + "flex items-center rounded-component-md px-3 text-sm cursor-pointer transition-colors duration-200", isCollapsed ? "h-[55px] w-[55px] mx-auto flex justify-center" : "h-[55px] gap-4 px-3", isActive ? "bg-chart-3 text-white" - : "text-text-auth-sub hover:bg-[#F6F6F6]", + : "text-text-auth-sub hover:bg-bg-surface", ); } function getFooterItemClass(isActive: boolean, isCollapsed: boolean) { return twMerge( - "flex w-full h-[55px] items-center rounded-xl px-3 text-sm cursor-pointer transition-all duration-200", + "flex w-full h-[55px] items-center rounded-component-md px-3 text-sm cursor-pointer transition-all duration-200", isCollapsed ? "justify-center px-0" : "gap-4 px-3", isActive ? "text-chart-3" : "text-text-auth-sub hover:text-chart-3", ); @@ -45,11 +45,11 @@ export default function Sidebar() { return (
-
+
{/* Logo */} {/* twMerge( - "flex h-10 items-center rounded-xl px-3 text-sm transition-all duration-200 whitespace-nowrap", + "flex h-10 items-center rounded-component-md px-3 text-sm transition-all duration-200 whitespace-nowrap", isCollapsed ? "" : "pl-4", isActive ? "bg-chart-3 text-white" - : "text-text-auth-sub hover:bg-[#F6F6F6]", + : "text-text-auth-sub hover:bg-bg-surface", ); const menuContainerClass = isCollapsed - ? "absolute left-full top-0 pl-2 w-52 flex flex-col gap-1 rounded-2xl bg-white p-2 shadow-lg z-50 whitespace-nowrap" + ? "absolute left-full top-0 pl-2 w-52 flex flex-col gap-1 rounded-component-md bg-white p-2 shadow-Soft z-50 whitespace-nowrap" : "ml-11 mt-1 flex flex-col gap-1 overflow-hidden transition-all duration-200"; return ( diff --git a/src/components/auth/common/InputActions.tsx b/src/components/auth/common/InputActions.tsx index dd13781..609660b 100644 --- a/src/components/auth/common/InputActions.tsx +++ b/src/components/auth/common/InputActions.tsx @@ -47,7 +47,7 @@ export default function InputActions({ {validationState && ( diff --git a/src/components/auth/flows/find-email/EnterPhoneStep.tsx b/src/components/auth/flows/find-email/EnterPhoneStep.tsx index 0de9049..5e9080d 100644 --- a/src/components/auth/flows/find-email/EnterPhoneStep.tsx +++ b/src/components/auth/flows/find-email/EnterPhoneStep.tsx @@ -149,7 +149,7 @@ export default function EnterPhoneStep({ onNext }: IEnterPhoneStepProps) { value={watchedPhone || ""} readOnly aria-label="입력된 전화번호" - className="w-full h-13.5 px-5 border rounding-15 text-body1 text-text-main bg-white border-brand-400 focus:outline-none focus:border-brand-400" + className="w-full h-13.5 px-5 border rounded-component-md text-body1 text-text-main bg-white border-brand-400 focus:outline-none focus:border-brand-400" />
diff --git a/src/components/auth/skeleton/LoginPageSkeleton.tsx b/src/components/auth/skeleton/LoginPageSkeleton.tsx index 71864f3..43e69b2 100644 --- a/src/components/auth/skeleton/LoginPageSkeleton.tsx +++ b/src/components/auth/skeleton/LoginPageSkeleton.tsx @@ -14,11 +14,11 @@ export default function LoginPageSkeleton() {
- +
- +
@@ -26,7 +26,7 @@ export default function LoginPageSkeleton() {
- +
diff --git a/src/components/auth/skeleton/SignupEmailStepSkeleton.tsx b/src/components/auth/skeleton/SignupEmailStepSkeleton.tsx index 8c53c6c..6d71400 100644 --- a/src/components/auth/skeleton/SignupEmailStepSkeleton.tsx +++ b/src/components/auth/skeleton/SignupEmailStepSkeleton.tsx @@ -12,17 +12,17 @@ export default function SignupEmailStepSkeleton() {
- +
- +
- +
- +
diff --git a/src/components/auth/skeleton/SignupPageSkeleton.tsx b/src/components/auth/skeleton/SignupPageSkeleton.tsx index ae7117b..efcec56 100644 --- a/src/components/auth/skeleton/SignupPageSkeleton.tsx +++ b/src/components/auth/skeleton/SignupPageSkeleton.tsx @@ -4,10 +4,10 @@ export default function SignupPageSkeleton() { return (
- - - - + + + +
diff --git a/src/components/common/alert/Alert.tsx b/src/components/common/alert/Alert.tsx index 8fe2386..dce12f0 100644 --- a/src/components/common/alert/Alert.tsx +++ b/src/components/common/alert/Alert.tsx @@ -17,7 +17,7 @@ export default function Alert({ children, ...rest }: IAlertProps) { - const base = "w-full rounding-20 px-5 py-4"; + const base = "w-full rounded-component-lg px-5 py-4"; const variantClasses: Record = { info: "text-brand-700", diff --git a/src/components/common/button/Button.stories.tsx b/src/components/common/button/Button.stories.tsx index 971560d..fedd818 100644 --- a/src/components/common/button/Button.stories.tsx +++ b/src/components/common/button/Button.stories.tsx @@ -66,7 +66,7 @@ export const Sizes: TButtonStory = { export const FullWidth: TButtonStory = { render: () => ( -
+
diff --git a/src/components/common/button/Button.tsx b/src/components/common/button/Button.tsx index f0ac644..9d61a00 100644 --- a/src/components/common/button/Button.tsx +++ b/src/components/common/button/Button.tsx @@ -29,7 +29,7 @@ export default function Button({ ...rest }: IButtonProps) { const sizeClasses = { - big: "h-button-big px-6 rounded-component-md font-heading3 transition-colors duration-normal ease-out", + big: "h-button-big px-6 rounded-component-md font-heading4 transition-colors duration-normal ease-out", small: "h-button-small px-4 rounded-component-sm font-body1 transition-colors duration-normal ease-out", }; diff --git a/src/components/common/dropdownmenu/DropdownMenu.tsx b/src/components/common/dropdownmenu/DropdownMenu.tsx index 160da39..14af28a 100644 --- a/src/components/common/dropdownmenu/DropdownMenu.tsx +++ b/src/components/common/dropdownmenu/DropdownMenu.tsx @@ -57,7 +57,7 @@ export function DropdownMenu({