From ff3bf13f48ff438e31bbac436766540f274cf992 Mon Sep 17 00:00:00 2001 From: TaehunLee <85233397+Todari@users.noreply.github.com> Date: Fri, 23 Aug 2024 00:02:06 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=94=94=EC=9E=90=EC=9D=B8=EC=8B=9C?= =?UTF-8?q?=EC=8A=A4=ED=85=9C=20=EC=9D=BC=EB=B6=80=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?(#475)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * design: 통일성 위해 디자인 수정 * chore: v0.1.78 배포 * chore: hdesign 0.1.78 적용 * chore: v0.1.79 배포 및 적용 --- HDesign/package-lock.json | 4 ++-- HDesign/package.json | 2 +- HDesign/src/components/Button/Button.style.ts | 6 +++--- .../components/DragHandleItem/DragHandleItem.style.ts | 4 ++-- .../DragHandleItemContainer/DragHandleItemContainer.tsx | 4 ++-- .../src/components/EditableItem/EditableItem.style.ts | 4 ++-- HDesign/src/components/FixedButton/FixedButton.style.ts | 4 ++-- client/package-lock.json | 9 ++++----- client/package.json | 2 +- 9 files changed, 19 insertions(+), 20 deletions(-) diff --git a/HDesign/package-lock.json b/HDesign/package-lock.json index 4bfb80709..c252ff81e 100644 --- a/HDesign/package-lock.json +++ b/HDesign/package-lock.json @@ -1,12 +1,12 @@ { "name": "haengdong-design", - "version": "0.1.77", + "version": "0.1.79", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "haengdong-design", - "version": "0.1.77", + "version": "0.1.79" "license": "ISC", "dependencies": { "@emotion/react": "^11.11.4", diff --git a/HDesign/package.json b/HDesign/package.json index 0cc67d62f..9013c10ec 100644 --- a/HDesign/package.json +++ b/HDesign/package.json @@ -1,6 +1,6 @@ { "name": "haengdong-design", - "version": "0.1.77", + "version": "0.1.79", "description": "", "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/HDesign/src/components/Button/Button.style.ts b/HDesign/src/components/Button/Button.style.ts index e8d68d635..295fbc50c 100644 --- a/HDesign/src/components/Button/Button.style.ts +++ b/HDesign/src/components/Button/Button.style.ts @@ -46,21 +46,21 @@ const getButtonSizeStyle = (size: ButtonSize) => { const style = { small: css({ padding: '0.5rem 0.75rem', - borderRadius: '0.75rem', + borderRadius: '0.5rem', fontFamily: 'Pretendard', fontSize: '0.75rem', fontWeight: '400', }), medium: css({ padding: '0.75rem 1rem', - borderRadius: '1rem', + borderRadius: '0.75rem', fontFamily: 'Pretendard', fontSize: '1rem', fontWeight: '700', }), large: css({ padding: '1rem 1.5rem', - borderRadius: '1.25rem', + borderRadius: '1rem', fontFamily: 'Pretendard', fontSize: '1.25rem', fontWeight: '700', diff --git a/HDesign/src/components/DragHandleItem/DragHandleItem.style.ts b/HDesign/src/components/DragHandleItem/DragHandleItem.style.ts index c23166272..b641c5fb3 100644 --- a/HDesign/src/components/DragHandleItem/DragHandleItem.style.ts +++ b/HDesign/src/components/DragHandleItem/DragHandleItem.style.ts @@ -8,8 +8,8 @@ export const dragHandleItemStyle = (theme: Theme, hasDragHandle: boolean, backgr css({ display: 'flex', justifyContent: 'space-between', - padding: hasDragHandle ? '0.5rem 0.5rem 0.5rem 0.25rem' : '0.5rem', - borderRadius: '0.5rem', + padding: hasDragHandle ? '0.5rem 1rem 0.5rem 0.5rem' : '0.5rem 1rem', + borderRadius: '0.75rem', backgroundColor: theme.colors[backgroundColor], }); diff --git a/HDesign/src/components/DragHandleItemContainer/DragHandleItemContainer.tsx b/HDesign/src/components/DragHandleItemContainer/DragHandleItemContainer.tsx index 9bd54eacf..a95bfb5de 100644 --- a/HDesign/src/components/DragHandleItemContainer/DragHandleItemContainer.tsx +++ b/HDesign/src/components/DragHandleItemContainer/DragHandleItemContainer.tsx @@ -24,7 +24,7 @@ export const DragHandleItemContainer: React.FC = ( return (
- + {topLeftText} @@ -33,7 +33,7 @@ export const DragHandleItemContainer: React.FC = ( {children} - + {bottomLeftText} diff --git a/HDesign/src/components/EditableItem/EditableItem.style.ts b/HDesign/src/components/EditableItem/EditableItem.style.ts index a0fe3ca2a..97142f2d8 100644 --- a/HDesign/src/components/EditableItem/EditableItem.style.ts +++ b/HDesign/src/components/EditableItem/EditableItem.style.ts @@ -8,8 +8,8 @@ export const editableItemStyle = (theme: Theme, backgroundColor: ColorKeys) => css({ display: 'flex', justifyContent: 'space-between', - padding: '0.5rem', - borderRadius: '0.5rem', + padding: '0.5rem 1rem', + borderRadius: '0.75rem', backgroundColor: theme.colors[backgroundColor], }); diff --git a/HDesign/src/components/FixedButton/FixedButton.style.ts b/HDesign/src/components/FixedButton/FixedButton.style.ts index b4d94038c..069157413 100644 --- a/HDesign/src/components/FixedButton/FixedButton.style.ts +++ b/HDesign/src/components/FixedButton/FixedButton.style.ts @@ -47,7 +47,7 @@ export const deleteButtonStyle = (theme: Theme) => [ color: theme.colors.white, fontFamily: 'Pretendard', - fontSize: '1.25rem', + fontSize: '1rem', fontWeight: '700', lineHeight: '1', @@ -66,7 +66,7 @@ const getFixedButtonDefaultStyle = (theme: Theme) => display: 'flex', justifyContent: 'center', padding: '1rem 1.5rem', - borderRadius: '1.25rem', + borderRadius: '1rem', width: '100%', fontFamily: 'Pretendard', diff --git a/client/package-lock.json b/client/package-lock.json index 3a0f5e4ef..7d848fac2 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -12,7 +12,7 @@ "@emotion/react": "^11.11.4", "@sentry/react": "^8.25.0", "@tanstack/react-query": "^5.51.23", - "haengdong-design": "^0.1.77", + "haengdong-design": "^0.1.79", "react": "^18.3.1", "react-copy-to-clipboard": "^5.1.0", "react-dom": "^18.3.1", @@ -10137,10 +10137,9 @@ } }, "node_modules/haengdong-design": { - "version": "0.1.77", - "resolved": "https://registry.npmjs.org/haengdong-design/-/haengdong-design-0.1.77.tgz", - "integrity": "sha512-+M41hUpL2ilwBAlaeYSinfsHy2DAMHnTq0B3tRtccJ1EKzCU3GPK3rA4z3km3GFLlmE3aOErtOeRV/xp6Y2kKA==", - "dependencies": { + "version": "0.1.79", + "resolved": "https://registry.npmjs.org/haengdong-design/-/haengdong-design-0.1.79.tgz", + "integrity": "sha512-J5uFXmX+1VMzdU+aMTl36hJYrjzreLNhrtLMSBrdHtjwEROsYddbbXDlHTTUWaj7TpDQ1n5jgsy39jlKYv2m7w==", "dependencies": { "@emotion/react": "^11.11.4", "@storybook/addon-webpack5-compiler-swc": "^1.0.5", "@svgr/webpack": "^8.1.0", diff --git a/client/package.json b/client/package.json index 81ea29821..b6171fa31 100644 --- a/client/package.json +++ b/client/package.json @@ -68,7 +68,7 @@ "@emotion/react": "^11.11.4", "@sentry/react": "^8.25.0", "@tanstack/react-query": "^5.51.23", - "haengdong-design": "^0.1.77", + "haengdong-design": "^0.1.79", "react": "^18.3.1", "react-copy-to-clipboard": "^5.1.0", "react-dom": "^18.3.1",