freedak/TurboHR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复 Tailwind CSS border 类名冲突（border-border-default 改为直接颜色值）

Browse Source
This commit is contained in:
selfrelease
2026-07-31 17:43:50 +08:00
parent 821a62e3f8
commit e7dfe3c380
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/ui/DataTable.tsx
+3 -3
View File
@@ -48,10 +48,10 @@ export function DataTable<T>({
align === 'right' ? 'text-right' : align === 'center' ? 'text-center' : 'text-left' align === 'right' ? 'text-right' : align === 'center' ? 'text-center' : 'text-left'
return ( return (
<div className={clsx('overflow-x-auto border border-border-default rounded-card bg-surface-card', className)}> <div className={clsx('overflow-x-auto border border-[#DDE1DD] rounded-card bg-surface-card', className)}>
<table className="w-full text-sm"> <table className="w-full text-sm">
<thead> <thead>
<tr className="border-b border-border-default bg-surface-muted"> <tr className="border-b border-[#DDE1DD] bg-surface-muted">
{columns.map((col) => ( {columns.map((col) => (
<th <th
key={col.key} key={col.key}
@@ -99,7 +99,7 @@ export function DataTable<T>({
key={rowKey(row)} key={rowKey(row)}
onClick={onRowClick ? () => onRowClick(row) : undefined} onClick={onRowClick ? () => onRowClick(row) : undefined}
className={clsx( className={clsx(
'border-b border-border-subtle transition-colors', 'border-b border-[#ECEEEC] transition-colors',
onRowClick && 'cursor-pointer hover:bg-surface-muted', onRowClick && 'cursor-pointer hover:bg-surface-muted',
)} )}
> >
frontend/src/components/ui/FilterBar.tsx
+1 -1
View File
@@ -40,7 +40,7 @@ export function FilterBar({
value={searchValue || ''} value={searchValue || ''}
onChange={(e) => onSearchChange(e.target.value)} onChange={(e) => onSearchChange(e.target.value)}
placeholder={searchPlaceholder} placeholder={searchPlaceholder}
className="w-full pl-8 pr-3 py-1.5 rounded-md border border-border-default bg-surface-card text-sm text-ink-900 focus:outline-none focus:ring-2 focus:ring-brand-600/30 focus:border-brand-600 transition-colors" className="w-full pl-8 pr-3 py-1.5 rounded-md border border-[#DDE1DD] bg-surface-card text-sm text-ink-900 focus:outline-none focus:ring-2 focus:ring-brand-600/30 focus:border-brand-600 transition-colors"
/> />
</div> </div>
)} )}
frontend/src/index.css
+3 -3
View File
@@ -33,16 +33,16 @@
@apply btn bg-brand-600 text-white hover:bg-brand-700; @apply btn bg-brand-600 text-white hover:bg-brand-700;
} }
.btn-secondary { .btn-secondary {
@apply btn bg-surface-muted text-ink-700 hover:bg-border-subtle; @apply btn bg-surface-muted text-ink-700 hover:bg-surface-card;
} }
.btn-danger { .btn-danger {
@apply btn bg-danger text-white hover:bg-danger-light; @apply btn bg-danger text-white hover:bg-danger-light;
} }
.card { .card {
@apply bg-surface-card rounded-card border border-border-default; @apply bg-surface-card rounded-card border border-[#DDE1DD];
} }
.input { .input {
@apply w-full px-2.5 py-2 rounded-md border border-border-default bg-surface-card text-sm text-ink-900 focus:outline-none focus:ring-2 focus:ring-brand-600/30 focus:border-brand-600 transition-colors; @apply w-full px-2.5 py-2 rounded-md border border-[#DDE1DD] bg-surface-card text-sm text-ink-900 focus:outline-none focus:ring-2 focus:ring-brand-600/30 focus:border-brand-600 transition-colors;
} }
.label { .label {
@apply block text-sm font-medium text-ink-700 mb-1; @apply block text-sm font-medium text-ink-700 mb-1;
frontend/src/pages/dashboard/PerformanceStats.tsx
+1 -1
View File
@@ -54,7 +54,7 @@ export default function PerformanceStats() {
<select <select
value={period} value={period}
onChange={(e) => setPeriod(e.target.value)} onChange={(e) => setPeriod(e.target.value)}
className="text-xs px-2 py-1 rounded border border-border-default bg-surface-card text-ink-700 focus:outline-none focus:ring-2 focus:ring-brand-600/30" className="text-xs px-2 py-1 rounded border border-[#DDE1DD] bg-surface-card text-ink-700 focus:outline-none focus:ring-2 focus:ring-brand-600/30"
> >
{[new Date().getFullYear(), new Date().getFullYear() - 1].map(y => ( {[new Date().getFullYear(), new Date().getFullYear() - 1].map(y => (
<option key={y} value={y}>{y} 年</option> <option key={y} value={y}>{y} 年</option>