Skip to content

Commit

Permalink
Merge pull request #121 from DDD-Community/feat/#118
Browse files Browse the repository at this point in the history
feat: 마크업 수정
  • Loading branch information
G-hoon authored Nov 5, 2024
2 parents a7a4435 + a1d0344 commit 4e61042
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions src/pages/MyPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ export default function MyPage() {
}

return (
<div className="bg-gray-50 pl-[110px] pt-12">
<div className="h-full min-w-[1216px] bg-gray-50 pl-[110px] pr-[108px] pt-12">
<h1 className="text-[22px] font-bold text-zinc-900">마이 페이지</h1>
<div className="flex flex-col gap-4 pt-11">
<div className="flex h-[56px] max-w-[998px] items-center justify-between rounded-xl border border-gray-200 bg-white pl-6">
<div className="flex h-[56px] max-w-full items-center justify-between rounded-xl border border-gray-200 bg-white pl-6">
<div className="flex items-center gap-6">
<div className="text-sm">닉네임</div>
<div>{user?.nickname}</div>
Expand All @@ -38,7 +38,7 @@ export default function MyPage() {
</button>
</div>
</div>
<div className="flex h-[56px] max-w-[998px] items-center gap-6 rounded-xl border border-gray-200 bg-white pl-6">
<div className="flex h-[56px] max-w-full items-center gap-6 rounded-xl border border-gray-200 bg-white pl-6">
<div className="text-sm">로그인 수단</div>
<div>카카오 계정</div>
</div>
Expand Down
34 changes: 17 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@

"@esbuild/[email protected]":
version "0.18.20"
resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz"
resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1"
integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==

"@esbuild/[email protected]":
Expand Down Expand Up @@ -300,7 +300,7 @@

"@esbuild/[email protected]":
version "0.18.20"
resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz"
integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==

"@eslint-community/eslint-utils@^4.2.0":
Expand Down Expand Up @@ -640,7 +640,7 @@

"@types/react-lottie@^1.2.10":
version "1.2.10"
resolved "https://registry.yarnpkg.com/@types/react-lottie/-/react-lottie-1.2.10.tgz#220f68a2dfa0d4b131ab4930e8bf166b9442c68c"
resolved "https://registry.npmjs.org/@types/react-lottie/-/react-lottie-1.2.10.tgz"
integrity sha512-rCd1p3US4ELKJlqwVnP0h5b24zt5p9OCvKUoNpYExLqwbFZMWEiJ6EGLMmH7nmq5V7KomBIbWO2X/XRFsL0vCA==
dependencies:
"@types/react" "*"
Expand Down Expand Up @@ -971,7 +971,7 @@ [email protected]:

babel-runtime@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
dependencies:
core-js "^2.4.0"
Expand Down Expand Up @@ -1130,7 +1130,7 @@ convert-source-map@^2.0.0:

core-js@^2.4.0:
version "2.6.12"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==

core-js@^3.28.0:
Expand Down Expand Up @@ -1201,7 +1201,7 @@ data-view-byte-offset@^1.0.0:

dayjs@^1.11.13:
version "1.11.13"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz"
integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==

debug@^3.2.7:
Expand Down Expand Up @@ -1297,15 +1297,15 @@ eastasianwidth@^0.2.0:

echarts-for-react@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/echarts-for-react/-/echarts-for-react-3.0.2.tgz#ac5859157048a1066d4553e34b328abb24f2b7c1"
resolved "https://registry.npmjs.org/echarts-for-react/-/echarts-for-react-3.0.2.tgz"
integrity sha512-DRwIiTzx8JfwPOVgGttDytBqdp5VzCSyMRIxubgU/g2n9y3VLUmF2FK7Icmg/sNVkv4+rktmrLN9w22U2yy3fA==
dependencies:
fast-deep-equal "^3.1.3"
size-sensor "^1.0.1"

echarts@^5.5.1:
version "5.5.1"
resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.5.1.tgz#8dc9c68d0c548934bedcb5f633db07ed1dd2101c"
resolved "https://registry.npmjs.org/echarts/-/echarts-5.5.1.tgz"
integrity sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==
dependencies:
tslib "2.3.0"
Expand Down Expand Up @@ -1837,7 +1837,7 @@ fs.realpath@^1.0.0:

fsevents@~2.3.2:
version "2.3.3"
resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==

function-bind@^1.1.2:
Expand Down Expand Up @@ -2402,7 +2402,7 @@ loose-envify@^1.1.0, loose-envify@^1.4.0:

lottie-web@^5.1.3:
version "5.12.2"
resolved "https://registry.yarnpkg.com/lottie-web/-/lottie-web-5.12.2.tgz#579ca9fe6d3fd9e352571edd3c0be162492f68e5"
resolved "https://registry.npmjs.org/lottie-web/-/lottie-web-5.12.2.tgz"
integrity sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg==

lower-case@^2.0.2:
Expand All @@ -2426,7 +2426,7 @@ lru-cache@^5.1.1:

lucide-react@^0.435.0:
version "0.435.0"
resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.435.0.tgz#88c5cc6de61b89e42cbef309a38f100deee1bb32"
resolved "https://registry.npmjs.org/lucide-react/-/lucide-react-0.435.0.tgz"
integrity sha512-we5GKfzjMDw9m9SsyZJvWim9qaT+Ya5kaRS+OGFqgLqXUrPM1h+7CiMw5pKdEIoaBqfXz2pyv9TASAdpIAJs0Q==

make-error@^1.1.1:
Expand Down Expand Up @@ -2846,7 +2846,7 @@ react-is@^16.13.1:

react-lottie@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/react-lottie/-/react-lottie-1.2.4.tgz#999ccabff8afc82074588bc50bd75be6f8945161"
resolved "https://registry.npmjs.org/react-lottie/-/react-lottie-1.2.4.tgz"
integrity sha512-kBGxI+MIZGBf4wZhNCWwHkMcVP+kbpmrLWH/SkO0qCKc7D7eSPcxQbfpsmsCo8v2KCBYjuGSou+xTqK44D/jMg==
dependencies:
babel-runtime "^6.26.0"
Expand Down Expand Up @@ -2874,7 +2874,7 @@ [email protected]:

react-tailwindcss-datepicker@^1.7.2:
version "1.7.2"
resolved "https://registry.yarnpkg.com/react-tailwindcss-datepicker/-/react-tailwindcss-datepicker-1.7.2.tgz#ee2525b2a82211fc5756285265feaa459e102301"
resolved "https://registry.npmjs.org/react-tailwindcss-datepicker/-/react-tailwindcss-datepicker-1.7.2.tgz"
integrity sha512-/NIRLB1evT69pt3Syol3cZpsAnLZlGvFWav98/Rr77Gey382C1fjKW2Emgu+SC4NtiRt6CBFwx/0Wbkn4iI+nA==

react@^18.2.0:
Expand Down Expand Up @@ -2913,7 +2913,7 @@ reflect.getprototypeof@^1.0.4:

regenerator-runtime@^0.11.0:
version "0.11.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==

regexp.prototype.flags@^1.5.2:
Expand Down Expand Up @@ -3067,7 +3067,7 @@ signal-exit@^4.0.1:

size-sensor@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/size-sensor/-/size-sensor-1.0.2.tgz#b8f8da029683cf2b4e22f12bf8b8f0a1145e8471"
resolved "https://registry.npmjs.org/size-sensor/-/size-sensor-1.0.2.tgz"
integrity sha512-2NCmWxY7A9pYKGXNBfteo4hy14gWu47rg5692peVMst6lQLPKrVjhY+UTEsPI5ceFRJSl3gVgMYaUi/hKuaiKw==

slash@^3.0.0:
Expand Down Expand Up @@ -3360,7 +3360,7 @@ tsconfig-paths@^3.15.0:

[email protected]:
version "2.3.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"
integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==

tslib@^1.8.1:
Expand Down Expand Up @@ -3632,7 +3632,7 @@ yocto-queue@^0.1.0:

[email protected]:
version "5.6.0"
resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.6.0.tgz#01325b0bb38332dd5e87a8dbee7336cafc0f4a5b"
resolved "https://registry.npmjs.org/zrender/-/zrender-5.6.0.tgz"
integrity sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==
dependencies:
tslib "2.3.0"
Expand Down

0 comments on commit 4e61042

Please sign in to comment.