Merge branch 'develop' into design/profile

Author: huuitae

src/components/icon/Icon.stories.tsx src/components/icon/icon.stories.tsxsrc/components/icon/Icon.stories.tsx renamed to src/components/icon/icon.stories.tsx

@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from "@storybook/nextjs";
-import Icon from "./Icon";
+import Icon from "./icon";
 import ICON_MAP from "./icon-map";
 
 const meta = {
@@ -17,7 +17,7 @@ const meta = {
     },
     size: {
       control: "select",
-      options: ["xs", "sm", "md", "lg", "xl", "2xl"],
+      options: ["xs", "sm", "md", "2md", "lg", "xl", "2xl"],
       description: "아이콘 크기",
     },
     color: {

src/components/icon/Icon.tsx src/components/icon/icon.tsxsrc/components/icon/Icon.tsx renamed to src/components/icon/icon.tsx

@@ -22,6 +22,7 @@ const iconVariants = cva("inline-block", {
       xs: "ic-xs",
       sm: "ic-sm",
       md: "ic-md",
+      "2md": "ic-2md",
       lg: "ic-lg",
       xl: "ic-xl",
       "2xl": "ic-2xl",

src/components/index.ts

@@ -5,7 +5,7 @@ export { default as Chip } from "./chip/chip";
 export { default as Flavor } from "./flavor/flavor";
 export { default as TextInput } from "./text-input/text-input";
 export { default as SelectType } from "./select-type/select-type";
-export { default as Icon } from "./icon/Icon";
+export { default as Icon } from "./icon/icon";
 export { default as BlockGauge } from "./gauge/block-gauge";
 export { default as DetailTaste } from "./taste/detail-taste";
 export { default as ReviewTaste } from "./taste/review-taste";

src/components/text-input/text-input.tsx

@@ -1,6 +1,6 @@
 import { cn } from "@/lib/utils";
 import { ComponentProps } from "react";
-import Icon from "../icon/Icon";
+import Icon from "../icon/icon";
 
 interface InputValue extends ComponentProps<"input"> {
   placeholder?: string;

tailwind.config.ts

@@ -7,7 +7,7 @@ export default {
     "./src/components/**/*.{js,ts,jsx,tsx,mdx}",
     "./src/app/**/*.{js,ts,jsx,tsx,mdx}",
   ],
-  safelist: ["ic-xs", "ic-sm", "ic-md", "ic-lg", "ic-xl", "ic-2xl"],
+  safelist: ["ic-xs", "ic-sm", "ic-md", "ic-2md", "ic-lg", "ic-xl", "ic-2xl"],
   theme: {
     extend: {
       colors: {
@@ -85,6 +85,7 @@ export default {
         ".ic-xs": { width: "16px", height: "16px" },
         ".ic-sm": { width: "20px", height: "20px" },
         ".ic-md": { width: "24px", height: "24px" },
+        ".ic-2md": { width: "28px", height: "28px" },
         ".ic-lg": { width: "32px", height: "32px" },
         ".ic-xl": { width: "40px", height: "40px" },
         ".ic-2xl": { width: "48px", height: "48px" },