From b64ff7c081d4b634039c0b19f53717d95d951b94 Mon Sep 17 00:00:00 2001 From: bicochan Date: Thu, 13 Mar 2025 13:25:51 +0900 Subject: [PATCH] =?UTF-8?q?design:=20=EA=B3=B5=ED=86=B5=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EB=8B=A4=ED=81=AC=20=ED=85=8C?= =?UTF-8?q?=EB=A7=88=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/assets/src/styles/base.css | 8 +++ .../common/components/src/ui/dialog/index.tsx | 8 +-- .../common/components/src/ui/header/index.tsx | 6 ++- .../common/components/src/ui/input/index.tsx | 2 +- .../components/src/ui/layout/footer.tsx | 6 ++- .../common/components/src/ui/layout/lnb.tsx | 2 +- .../common/components/src/ui/select/index.tsx | 2 +- .../common/components/src/ui/table/index.tsx | 7 ++- .../common/components/src/ui/table/table.css | 50 ++++++++++++------- tailwind.config.preset.ts | 4 ++ 10 files changed, 65 insertions(+), 30 deletions(-) diff --git a/packages/common/assets/src/styles/base.css b/packages/common/assets/src/styles/base.css index 2d73b09df..8a33518bc 100644 --- a/packages/common/assets/src/styles/base.css +++ b/packages/common/assets/src/styles/base.css @@ -32,6 +32,10 @@ --chart-5: #ff7865; --chart-6: #e65db5; --radius: 1rem; + --field: #fff; + --form: #fff; + --container: #f1f6f9; + --title: #4c5e6f; } [data-mode="dark"] { --background: #0a0a0a; @@ -62,5 +66,9 @@ --chart-5: #ffbcad; --chart-6: #f4a0d3; --radius: 1rem; + --field: #5b6269; + --form: #1a1a1a; + --container: #0a0a0a; + --title: #fff; } } diff --git a/packages/common/components/src/ui/dialog/index.tsx b/packages/common/components/src/ui/dialog/index.tsx index 1186ce636..b2ba92d05 100644 --- a/packages/common/components/src/ui/dialog/index.tsx +++ b/packages/common/components/src/ui/dialog/index.tsx @@ -36,14 +36,14 @@ const DialogContent = React.forwardRef< {children} - + Close @@ -71,7 +71,7 @@ const DialogFooter = ({ }: React.HTMLAttributes) => (
+

logo - 통합플랫폼관리 + + 통합플랫폼관리 +

diff --git a/packages/common/components/src/ui/input/index.tsx b/packages/common/components/src/ui/input/index.tsx index 70bb9827c..963ef1947 100644 --- a/packages/common/components/src/ui/input/index.tsx +++ b/packages/common/components/src/ui/input/index.tsx @@ -8,7 +8,7 @@ const Input = React.forwardRef>( -

© 2025 Ona And All. All Rights Reserved.

+
+

+ © 2025 Ona And All. All Rights Reserved. +

); } diff --git a/packages/common/components/src/ui/layout/lnb.tsx b/packages/common/components/src/ui/layout/lnb.tsx index 761633414..f7d3a9be8 100644 --- a/packages/common/components/src/ui/layout/lnb.tsx +++ b/packages/common/components/src/ui/layout/lnb.tsx @@ -2,7 +2,7 @@ export function LNB() { return (
  • diff --git a/packages/common/components/src/ui/select/index.tsx b/packages/common/components/src/ui/select/index.tsx index ffd63bb9a..77e8ec11a 100644 --- a/packages/common/components/src/ui/select/index.tsx +++ b/packages/common/components/src/ui/select/index.tsx @@ -19,7 +19,7 @@ const SelectTrigger = React.forwardRef< span]:line-clamp-1", + "bg-form flex h-[3.2rem] w-full items-center justify-between whitespace-nowrap rounded-sm border border-input px-4 py-2 text-[1.3rem] text-label ring-offset-background focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[placeholder]:text-muted-foreground [&>span]:line-clamp-1", className, )} {...props} diff --git a/packages/common/components/src/ui/table/index.tsx b/packages/common/components/src/ui/table/index.tsx index e96ea7e4d..34505c898 100644 --- a/packages/common/components/src/ui/table/index.tsx +++ b/packages/common/components/src/ui/table/index.tsx @@ -63,7 +63,7 @@ const TableRow = React.forwardRef< (({ className, ...props }, ref) => ( )); diff --git a/packages/common/components/src/ui/table/table.css b/packages/common/components/src/ui/table/table.css index 7736b04f0..53e7ea616 100644 --- a/packages/common/components/src/ui/table/table.css +++ b/packages/common/components/src/ui/table/table.css @@ -1,22 +1,38 @@ -th { - @apply bg-[#5987bf] px-4 py-[1.2rem] text-[1.3rem] font-medium leading-[1.2] text-[#fff]; -} -td { - @apply border-b border-b-[#e0e6ea] px-2 py-[1.2rem] text-[1.3rem] font-normal leading-[1.2] text-[#666]; -} +@tailwind components; -.secondary th { - @apply border border-[#e0e6ea] bg-[#eaf3fb] text-[#647784]; -} +@layer components { + th { + @apply bg-[#5987bf] px-4 py-[1.2rem] text-[1.3rem] font-medium leading-[1.2] text-[#fff]; + } + td { + @apply border-b border-b-border px-2 py-[1.2rem] text-[1.3rem] font-normal leading-[1.2] text-[#666]; + } -.secondary td { - @apply border border-[#e0e6ea]; -} + .secondary th { + @apply border border-border bg-[#eaf3fb] text-[#647784]; + } -.line th { - @apply border-0 border-b-2 border-t border-b-[#d4e0ea] border-t-[#d4e0ea] bg-[#fff] text-[#555]; -} + .secondary td { + @apply border border-border; + } -.line td { - @apply border-b border-b-[#e0e6ea]; + .line th { + @apply border-0 border-b-2 border-t border-b-[#d4e0ea] border-t-[#d4e0ea] bg-[#fff] text-[#555]; + } + + .line td { + @apply border-b border-b-border; + } + + [data-mode="dark"] { + th { + @apply bg-[#5e7b9c] text-[#fff]; + } + .secondary th { + @apply bg-[#1a1c1d]; + } + .line th { + @apply bg-[#0a0a0a]; + } + } } diff --git a/tailwind.config.preset.ts b/tailwind.config.preset.ts index ee341683e..9eb83e4d7 100644 --- a/tailwind.config.preset.ts +++ b/tailwind.config.preset.ts @@ -50,6 +50,10 @@ export default { 4: "var(--chart-4)", 5: "var(--chart-5)", }, + field: "var(--field)", + form: "var(--form)", + container: "var(--container)", + title: "var(--title)", }, keyframes: { "accordion-down": {