Skip to content

Commit f99e410

Browse files
committed
simplify colors
1 parent 6854fe0 commit f99e410

File tree

2 files changed

+16
-61
lines changed

2 files changed

+16
-61
lines changed

vscode/react/src/App.css

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,23 @@
8181

8282
--color-lineage-node-appendix-background: transparent;
8383

84-
--color-lineage-node-type-background-sql: var(--vscode-errorForeground);
85-
--color-lineage-node-type-foreground-sql: var(--vscode-errorForeground);
86-
--color-lineage-node-type-border-sql: var(--vscode-errorForeground);
84+
--color-lineage-node-type-background-sql: var(
85+
--vscode-minimap-errorHighlight
86+
);
87+
--color-lineage-node-type-foreground-sql: var(
88+
--vscode-minimap-errorHighlight
89+
);
90+
--color-lineage-node-type-border-sql: var(--vscode-minimap-errorHighlight);
8791

8892
--color-lineage-node-type-background-python: var(
89-
--vscode-list-warningForeground
93+
--vscode-editorWarning-foreground
9094
);
9195
--color-lineage-node-type-foreground-python: var(
92-
--vscode-list-warningForeground
96+
--vscode-editorWarning-foreground
97+
);
98+
--color-lineage-node-type-border-python: var(
99+
--vscode-editorWarning-foreground
93100
);
94-
--color-lineage-node-type-border-python: var(--vscode-list-warningForeground);
95101

96102
--color-lineage-node-type-background-source: var(
97103
--vscode-minimap-infoHighlight

vscode/react/src/pages/ModelNode.tsx

Lines changed: 4 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {
2222
ZOOM_THRESHOLD,
2323
NodeContainer,
2424
NodeBase,
25-
NodeDivider,
2625
NodeHandleIcon,
2726
NodeHandles,
2827
NodeHeader,
@@ -33,16 +32,11 @@ import {
3332
NodePorts,
3433
type NodeProps,
3534
} from '@tobikodata/sqlmesh-common/lineage'
36-
import {
37-
getNodeTypeBorderColor,
38-
getNodeTypeColor,
39-
getNodeTypeTextColor,
40-
} from './help'
35+
import { getNodeTypeColor } from './help'
4136
import {
4237
Badge,
4338
cn,
4439
HorizontalContainer,
45-
Metadata,
4640
ModelName,
4741
Tooltip,
4842
VerticalContainer,
@@ -189,7 +183,6 @@ export const ModelNode = React.memo(function ModelNode({
189183
isSelected
190184
? 'ring-2 ring-lineage-node-selected-border ring-offset-lineage-node-background'
191185
: 'hover:ring-2 hover:ring-lineage-node-border-hover',
192-
getNodeTypeBorderColor(modelType),
193186
)}
194187
>
195188
<VerticalContainer
@@ -204,32 +197,11 @@ export const ModelNode = React.memo(function ModelNode({
204197
<NodeHandles
205198
leftId={leftId}
206199
rightId={rightId}
207-
leftIcon={
208-
<NodeHandleIcon
209-
className={cn(
210-
'ml-0.5',
211-
getNodeTypeTextColor(modelType),
212-
getNodeTypeBorderColor(modelType),
213-
)}
214-
/>
215-
}
216-
rightIcon={
217-
<NodeHandleIcon
218-
className={cn(
219-
'mr-0.5',
220-
getNodeTypeTextColor(modelType),
221-
getNodeTypeBorderColor(modelType),
222-
)}
223-
/>
224-
}
200+
leftIcon={<NodeHandleIcon className="ml-0.5" />}
201+
rightIcon={<NodeHandleIcon className="mr-0.5" />}
225202
handleClassName="top-4"
226203
>
227-
<HorizontalContainer
228-
className={cn(
229-
'gap-2 items-center pl-4 pr-2',
230-
getNodeTypeBorderColor(modelType),
231-
)}
232-
>
204+
<HorizontalContainer className="gap-2 items-center pl-4 pr-2">
233205
<ModelName
234206
showTooltip
235207
hideCatalog
@@ -340,26 +312,3 @@ export const ModelNode = React.memo(function ModelNode({
340312
</NodeContainer>
341313
)
342314
})
343-
344-
export function NodeDetail({
345-
label,
346-
value,
347-
hasDivider = true,
348-
className,
349-
}: {
350-
label: string
351-
value: string
352-
hasDivider?: boolean
353-
className?: string
354-
}) {
355-
return (
356-
<>
357-
{hasDivider && <NodeDivider />}
358-
<Metadata
359-
label={label}
360-
value={value}
361-
className={cn('px-2 text-xs shrink-0 h-6', className)}
362-
/>
363-
</>
364-
)
365-
}

0 commit comments

Comments
 (0)