From 4b5ceb0e0a784af2a91d7163382c6e916a7f5c69 Mon Sep 17 00:00:00 2001 From: Leeinseo Date: Mon, 22 Jun 2026 13:06:30 +0900 Subject: [PATCH 1/4] FO dashboard-red theme edit-Leeinseo --- .../pages/(with-layout)/dashboard/facilityInfo/page.tsx | 8 ++++---- apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx | 2 +- apps/fo/src/app/styles/components-red.css | 4 ++-- packages/common/business_components/src/ui/tab/index.tsx | 2 +- .../business_components/src/ui/table/HeadMakeColSpan.tsx | 2 +- .../common/business_components/src/ui/table/index.tsx | 2 +- packages/common/components/src/ui/tabs/tabs.css | 2 ++ 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/page.tsx b/apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/page.tsx index e65fe3cc8..d4cfb7bab 100644 --- a/apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/page.tsx +++ b/apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/page.tsx @@ -226,7 +226,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
- +
{upChangeRePlanFclty} @@ -239,7 +239,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}: :((index === 6 || index === 7 || index === 8) && (head.id === 'now' || head.id === 'stepOne' || head.id === 'stepThree' || head.id === 'stepFour'))? null :((index === 5) && (head.id === 'provisionalApproval' || head.id === 'stepTwo'))? - {el[head.id]} + {el[head.id]} :((index === 5) && (head.id === 'now' || head.id === 'stepOne' || head.id === 'stepThree'|| head.id === 'stepFour'))? null :(index < 5 || index > 5)&& (index!= 4) && (head.id ==='provisionalApproval'||head.id ==='now'||head.id ==='stepOne'||head.id ==='stepTwo'||head.id ==='stepThree'||head.id ==='stepFour') @@ -250,7 +250,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}: ?null :(head.id === 'item' && index != 5)? {el[head.id]} - :{el[head.id]} + :{el[head.id]} ))} ))} @@ -260,7 +260,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
-
+
{upChangeHeadListOperationStatus} diff --git a/apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx b/apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx index 67e704570..05d906500 100644 --- a/apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx +++ b/apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx @@ -1,5 +1,5 @@ /** - * 대시보드 - 표로보기 상단구역 페에지 + * 대시보드 - 표로보기 상단구역 페이지 * * - 대시보드 - 표로보기의 3개의 탭 상단에 조회년도, 행정정보, 시설명의 구역을 컴포넌트 */ diff --git a/apps/fo/src/app/styles/components-red.css b/apps/fo/src/app/styles/components-red.css index cadffac52..c78e23183 100644 --- a/apps/fo/src/app/styles/components-red.css +++ b/apps/fo/src/app/styles/components-red.css @@ -15,12 +15,12 @@ } [data-theme="red"] { - .card-border { + /* .card-border { @apply border-[#3f4042] bg-[rgba(255,255,255,0.065)]; } .card-header { @apply border-b-[#3f4042]; - } + } */ } input[type="file"] { diff --git a/packages/common/business_components/src/ui/tab/index.tsx b/packages/common/business_components/src/ui/tab/index.tsx index 273a4b907..2c69f3f7d 100644 --- a/packages/common/business_components/src/ui/tab/index.tsx +++ b/packages/common/business_components/src/ui/tab/index.tsx @@ -30,7 +30,7 @@ const UITab = React.forwardRef< {tab.label} diff --git a/packages/common/business_components/src/ui/table/HeadMakeColSpan.tsx b/packages/common/business_components/src/ui/table/HeadMakeColSpan.tsx index b3d3fdc40..3ad4c8e23 100644 --- a/packages/common/business_components/src/ui/table/HeadMakeColSpan.tsx +++ b/packages/common/business_components/src/ui/table/HeadMakeColSpan.tsx @@ -29,7 +29,7 @@ const HeadMakeColSpan = ({ upHeadList }: { upHeadList: TableUpperProps[] }) => { colSpan={head.colSpan || 1} rowSpan={head.rowSpan || 1} style={{ whiteSpace: 'pre-line' }} - className="bg-gray-50" + className="" > {head.title} diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx index ed05a7f19..15aef7fa9 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -152,7 +152,7 @@ export function UiTable>({ <> )}
-
+
{widthFixed ? {leafCols.map(col => ( diff --git a/packages/common/components/src/ui/tabs/tabs.css b/packages/common/components/src/ui/tabs/tabs.css index b1227b0ce..bb097be0e 100644 --- a/packages/common/components/src/ui/tabs/tabs.css +++ b/packages/common/components/src/ui/tabs/tabs.css @@ -22,4 +22,6 @@ .tabs[data-variant="outline"] .tabs-trigger { @apply relative rounded-none rounded-t-sm border-border bg-background text-muted-foreground after:absolute after:bottom-0 after:left-0 after:h-[0.1rem] after:w-full after:bg-border after:content-[''] data-[state=active]:border data-[state=active]:border-b-0 data-[state=active]:border-border data-[state=active]:text-foreground data-[state=active]:after:bg-transparent; } + + } From 4f10864c2cca82b42f37ab6897a2ce3d397d69bb Mon Sep 17 00:00:00 2001 From: LGS Date: Mon, 22 Jun 2026 13:09:20 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[=20wr=20]=20=EB=AC=BC=EC=9E=AC=EC=9D=B4?= =?UTF-8?q?=EC=9A=A9=20=EB=A7=A4=EC=B9=AD=EC=8B=9C=EC=8A=A4=ED=85=9C=20Bla?= =?UTF-8?q?ck=20=ED=85=8C=EB=A7=88=20css=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wr/src/app/styles/components-black.css | 53 +++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/apps/wr/src/app/styles/components-black.css b/apps/wr/src/app/styles/components-black.css index fd651fe6c..d337b1ba1 100644 --- a/apps/wr/src/app/styles/components-black.css +++ b/apps/wr/src/app/styles/components-black.css @@ -15,6 +15,52 @@ } [data-theme="black"] { + .card { + color: #fff; + background-color: #0a0a0a !important; + } + form { + color: rgb(255 255 255); + } + label { + color: rgb(241, 241, 241); + } + input { + height: 3.2rem; + background-color: #1a1a1a; + border: 1px solid #262626; + border-radius: 4px; + } + input.text-gray-600 { + color: #f1f1f1; + } + button { + color: #171717; + } + button[role="combobox"] { + color: #f1f1f1; + background-color: rgb(26, 26, 26); + } + div [role='tablist'] { + border: unset; + gap: 4px; + } + .tabs-trigger[data-state="inactive"] { + color: #a4b7bf; + background: #55595d; + } + .tabs-trigger[data-state="inactive"]:hover { + color: #6bbaff; + background: #4c4f52; + } + .card-border { + box-shadow: 0 0 10px -1px #0000000f; + border: 1px solid #393939; + } + a[aria-current="page"] { + background-color: rgb(32, 148, 250); + color: #000; + } .card-border { @apply border-[#3f4042] bg-[rgba(255,255,255,0.065)]; } @@ -77,6 +123,13 @@ .gis-layer-toggle:hover { background: #1a1c20; } + + .table-ui.secondary th { + background-color : rgb(98, 104, 109) !important; + } + .table-ui.secondary tr { + background-color : rgb(84, 85, 86) !important; + } } input[type="file"] { From ef331363f737cdd0fff96ece8a1390a1e55ff050 Mon Sep 17 00:00:00 2001 From: LGS Date: Mon, 22 Jun 2026 13:09:53 +0900 Subject: [PATCH 3/4] =?UTF-8?q?Revert=20"[=20wr=20]=20=EB=AC=BC=EC=9E=AC?= =?UTF-8?q?=EC=9D=B4=EC=9A=A9=20=EB=A7=A4=EC=B9=AD=EC=8B=9C=EC=8A=A4?= =?UTF-8?q?=ED=85=9C=20Black=20=ED=85=8C=EB=A7=88=20css=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4f10864c2cca82b42f37ab6897a2ce3d397d69bb. --- apps/wr/src/app/styles/components-black.css | 53 --------------------- 1 file changed, 53 deletions(-) diff --git a/apps/wr/src/app/styles/components-black.css b/apps/wr/src/app/styles/components-black.css index d337b1ba1..fd651fe6c 100644 --- a/apps/wr/src/app/styles/components-black.css +++ b/apps/wr/src/app/styles/components-black.css @@ -15,52 +15,6 @@ } [data-theme="black"] { - .card { - color: #fff; - background-color: #0a0a0a !important; - } - form { - color: rgb(255 255 255); - } - label { - color: rgb(241, 241, 241); - } - input { - height: 3.2rem; - background-color: #1a1a1a; - border: 1px solid #262626; - border-radius: 4px; - } - input.text-gray-600 { - color: #f1f1f1; - } - button { - color: #171717; - } - button[role="combobox"] { - color: #f1f1f1; - background-color: rgb(26, 26, 26); - } - div [role='tablist'] { - border: unset; - gap: 4px; - } - .tabs-trigger[data-state="inactive"] { - color: #a4b7bf; - background: #55595d; - } - .tabs-trigger[data-state="inactive"]:hover { - color: #6bbaff; - background: #4c4f52; - } - .card-border { - box-shadow: 0 0 10px -1px #0000000f; - border: 1px solid #393939; - } - a[aria-current="page"] { - background-color: rgb(32, 148, 250); - color: #000; - } .card-border { @apply border-[#3f4042] bg-[rgba(255,255,255,0.065)]; } @@ -123,13 +77,6 @@ .gis-layer-toggle:hover { background: #1a1c20; } - - .table-ui.secondary th { - background-color : rgb(98, 104, 109) !important; - } - .table-ui.secondary tr { - background-color : rgb(84, 85, 86) !important; - } } input[type="file"] { From 7ac53e56d7e258772ff3c79b0394c42aa1d868ed Mon Sep 17 00:00:00 2001 From: LGS Date: Mon, 22 Jun 2026 13:17:12 +0900 Subject: [PATCH 4/4] WR dashboard-black theme edit-Leeinseo --- apps/wr/src/app/styles/components-black.css | 53 +++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/apps/wr/src/app/styles/components-black.css b/apps/wr/src/app/styles/components-black.css index fd651fe6c..d337b1ba1 100644 --- a/apps/wr/src/app/styles/components-black.css +++ b/apps/wr/src/app/styles/components-black.css @@ -15,6 +15,52 @@ } [data-theme="black"] { + .card { + color: #fff; + background-color: #0a0a0a !important; + } + form { + color: rgb(255 255 255); + } + label { + color: rgb(241, 241, 241); + } + input { + height: 3.2rem; + background-color: #1a1a1a; + border: 1px solid #262626; + border-radius: 4px; + } + input.text-gray-600 { + color: #f1f1f1; + } + button { + color: #171717; + } + button[role="combobox"] { + color: #f1f1f1; + background-color: rgb(26, 26, 26); + } + div [role='tablist'] { + border: unset; + gap: 4px; + } + .tabs-trigger[data-state="inactive"] { + color: #a4b7bf; + background: #55595d; + } + .tabs-trigger[data-state="inactive"]:hover { + color: #6bbaff; + background: #4c4f52; + } + .card-border { + box-shadow: 0 0 10px -1px #0000000f; + border: 1px solid #393939; + } + a[aria-current="page"] { + background-color: rgb(32, 148, 250); + color: #000; + } .card-border { @apply border-[#3f4042] bg-[rgba(255,255,255,0.065)]; } @@ -77,6 +123,13 @@ .gis-layer-toggle:hover { background: #1a1c20; } + + .table-ui.secondary th { + background-color : rgb(98, 104, 109) !important; + } + .table-ui.secondary tr { + background-color : rgb(84, 85, 86) !important; + } } input[type="file"] {