diff --git a/frontend/src/components/CareTable.tsx b/frontend/src/components/CareTable.tsx index 0952da9..01c8a9f 100644 --- a/frontend/src/components/CareTable.tsx +++ b/frontend/src/components/CareTable.tsx @@ -1,8 +1,9 @@ import { Table, type TableProps } from 'antd' import { normalizeTableColumns } from '../tableAlign' -/** Ant Design Table 래퍼 — 목록 정렬 규칙(헤더/텍스트 중앙, 숫자·금액 우측) 적용 */ +/** Ant Design Table 래퍼 — 목록 정렬 규칙(헤더/텍스트 중앙, 숫자·금액 우측) 적용 + * 접수리스트와 같이 행·열 구분선(bordered)을 기본으로 사용 */ export default function CareTable(props: TableProps) { - const { columns, ...rest } = props - return {...rest} columns={normalizeTableColumns(columns)} /> + const { columns, bordered = true, ...rest } = props + return {...rest} bordered={bordered} columns={normalizeTableColumns(columns)} /> } diff --git a/frontend/src/styles/app.css b/frontend/src/styles/app.css index 065436d..a90774d 100644 --- a/frontend/src/styles/app.css +++ b/frontend/src/styles/app.css @@ -3250,7 +3250,7 @@ html.theme-blue .home-postit-foot { .ant-btn-primary { background: var(--primary) !important; border-color: var(--primary) !important; - color: var(--on-primary) !important; + color: #fff !important; box-shadow: none !important; text-shadow: none !important; } @@ -3258,12 +3258,13 @@ html.theme-blue .home-postit-foot { .ant-btn-primary:not(:disabled):not(.ant-btn-disabled):focus { background: var(--primary-dark) !important; border-color: var(--primary-dark) !important; - color: var(--on-primary) !important; + color: #fff !important; box-shadow: none !important; } .ant-btn-primary:not(:disabled):not(.ant-btn-disabled):active { background: var(--primary-dark) !important; border-color: var(--primary-dark) !important; + color: #fff !important; box-shadow: none !important; } html.theme-blue .ant-btn-primary, @@ -4262,7 +4263,7 @@ html.theme-light .reception-order-page { .order-attach-buttons .order-search-btn.ant-btn-primary, .order-attach-buttons .order-search-btn.ant-btn-primary:hover, .order-attach-buttons .order-search-btn.ant-btn-primary:focus { - color: #000 !important; + color: #fff !important; } .order-search-fields { display: flex; @@ -4953,7 +4954,7 @@ table.order-list .floating-cell:hover .floating-layer { display: block; } .branch-row-btn.ant-btn-primary:not(.ant-btn-dangerous) { background: var(--primary) !important; border-color: var(--primary) !important; - color: #000 !important; + color: #fff !important; } .branch-list-page .branch-row-btn.ant-btn-primary.ant-btn-dangerous, .branch-row-btn.ant-btn-primary.ant-btn-dangerous { @@ -4962,7 +4963,7 @@ table.order-list .floating-cell:hover .floating-layer { display: block; } color: #fff !important; } -/* 모든 목록(테이블) 파란 primary 버튼 텍스트 = 좌측메뉴 active와 동일 검정 */ +/* 목록(테이블) 파란 primary 버튼 텍스트 = 흰색 */ .ant-table-tbody .ant-btn-primary:not(.ant-btn-dangerous), .ant-table-tbody .ant-btn-primary:not(.ant-btn-dangerous):hover, .ant-table-tbody .ant-btn-primary:not(.ant-btn-dangerous):focus, @@ -4970,10 +4971,26 @@ table.order-list .floating-cell:hover .floating-layer { display: block; } .member-expo-btn.ant-btn-primary, .member-expo-btn.ant-btn-primary:hover, .member-expo-btn.ant-btn-primary:focus { - color: #000 !important; + color: #fff !important; } .ant-table-tbody .ant-btn-primary.ant-btn-dangerous, .ant-table-tbody .ant-btn-primary.ant-btn-dangerous:hover, .ant-table-tbody .ant-btn-primary.ant-btn-dangerous:focus { color: #fff !important; } + +/* Ant Table bordered — 접수리스트(order-list)와 유사한 행·열 구분선 */ +.ant-table-bordered .ant-table-container, +.ant-table-bordered .ant-table-container table { + border-color: var(--border) !important; +} +.ant-table-bordered .ant-table-thead > tr > th, +.ant-table-bordered .ant-table-tbody > tr > td, +.ant-table-bordered .ant-table-summary > tr > th, +.ant-table-bordered .ant-table-summary > tr > td { + border-color: var(--border) !important; +} +html.theme-light .ant-table-bordered .ant-table-thead > tr > th, +html.theme-light .ant-table-bordered .ant-table-tbody > tr > td { + border-color: #d9dee5 !important; +}