Skip to content

Commit 0398b60

Browse files
committed
feat: Update HoverModelInfo and ModelListItem to use theme for consistent styling
1 parent 5143cb1 commit 0398b60

2 files changed

Lines changed: 30 additions & 17 deletions

File tree

DashAI/front/src/components/models/model/HoverModelInfo.jsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import React from "react";
22
import { Box, Typography, Popover } from "@mui/material";
3+
import { useTheme } from "@mui/material/styles";
34

45
export default function HoverModelInfo({
56
anchorEl,
67
hoveredModel,
78
handleMouseLeave,
89
}) {
10+
const theme = useTheme();
11+
912
return (
1013
<Popover
1114
open={Boolean(anchorEl)}
@@ -23,8 +26,8 @@ export default function HoverModelInfo({
2326
sx={{
2427
pointerEvents: "none",
2528
"& .MuiPopover-paper": {
26-
bgcolor: "rgb(20, 20, 24)",
27-
border: "1px solid rgb(63, 63, 70)",
29+
bgcolor: theme.palette.background.paper,
30+
border: `1px solid ${theme.palette.divider}`,
2831
borderRadius: 2,
2932
p: 2,
3033
maxWidth: 320,
@@ -37,15 +40,15 @@ export default function HoverModelInfo({
3740
{/* Title */}
3841
<Typography
3942
variant="subtitle2"
40-
sx={{ color: "rgb(250, 250, 250)", fontWeight: 600, mb: 1 }}
43+
sx={{ color: theme.palette.text.primary, fontWeight: 600, mb: 1 }}
4144
>
4245
{hoveredModel.display_name || hoveredModel.name}
4346
</Typography>
4447

4548
{/* Description */}
4649
<Typography
4750
variant="body2"
48-
sx={{ color: "rgb(161, 161, 170)", lineHeight: 1.5 }}
51+
sx={{ color: theme.palette.text.secondary, lineHeight: 1.5 }}
4952
>
5053
{hoveredModel.description ||
5154
hoveredModel.metadata?.description ||

DashAI/front/src/components/models/model/ModelListItem.jsx

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ export default function ModelListItem({ model, disabled = false, onClick }) {
3535
slotProps={{
3636
tooltip: {
3737
sx: {
38-
bgcolor: "rgb(33, 33, 33)",
39-
color: "rgb(255, 255, 255)",
38+
bgcolor: theme.palette.background.paper,
39+
color: theme.palette.text.primary,
4040
display: disabled ? "block" : "none",
41-
border: "1px solid rgb(63, 63, 70)",
41+
border: `1px solid ${theme.palette.divider}`,
4242
fontSize: "0.75rem",
4343
maxWidth: 300,
4444
"& .MuiTooltip-arrow": {
45-
color: "rgb(33, 33, 33)",
45+
color: theme.palette.background.paper,
4646
"&::before": {
47-
border: "1px solid rgb(63, 63, 70)",
47+
border: `1px solid ${theme.palette.divider}`,
4848
},
4949
},
5050
},
@@ -61,17 +61,21 @@ export default function ModelListItem({ model, disabled = false, onClick }) {
6161
alignItems: "center",
6262
gap: 1.5,
6363
p: 1.5,
64-
bgcolor: disabled ? "rgb(32, 32, 32)" : "rgb(44, 44, 44)",
65-
border: "1px solid rgb(39, 39, 42)",
64+
bgcolor: disabled
65+
? theme.palette.ui.disabled
66+
: theme.palette.ui.box,
67+
border: `1px solid ${theme.palette.ui.border}`,
6668
borderRadius: 1,
6769
cursor: disabled ? "not-allowed" : "pointer",
6870
transition: "all 0.2s",
6971
opacity: disabled ? 0.5 : 1,
7072
filter: disabled ? "grayscale(0.6)" : "none",
7173
position: "relative",
7274
"&:hover": {
73-
bgcolor: disabled ? "rgb(32, 32, 32)" : "rgb(60, 60, 60)",
74-
borderColor: disabled ? "rgb(39, 39, 42)" : color,
75+
bgcolor: disabled
76+
? theme.palette.ui.disabled
77+
: theme.palette.action.hover,
78+
borderColor: disabled ? theme.palette.ui.border : color,
7579
transform: disabled ? "none" : "translateX(4px)",
7680
},
7781
"&::after": disabled
@@ -96,14 +100,18 @@ export default function ModelListItem({ model, disabled = false, onClick }) {
96100
width: 36,
97101
height: 36,
98102
borderRadius: 1,
99-
bgcolor: disabled ? "rgb(50, 50, 50)" : "rgb(63, 63, 70)",
100-
color: disabled ? "rgb(150, 150, 150)" : "rgb(250, 250, 250)",
103+
bgcolor: disabled
104+
? theme.palette.ui.disabled
105+
: theme.palette.ui.border,
106+
color: disabled
107+
? theme.palette.text.disabled
108+
: theme.palette.text.primary,
101109
flexShrink: 0,
102110
}}
103111
>
104112
<ModelIcon
105113
iconName={iconName}
106-
color={disabled ? "rgb(100, 100, 100)" : color}
114+
color={disabled ? theme.palette.text.disabled : color}
107115
/>
108116
</Box>
109117

@@ -112,7 +120,9 @@ export default function ModelListItem({ model, disabled = false, onClick }) {
112120
<Typography
113121
variant="body2"
114122
sx={{
115-
color: disabled ? "rgb(150, 150, 150)" : "rgb(250, 250, 250)",
123+
color: disabled
124+
? theme.palette.text.disabled
125+
: theme.palette.text.primary,
116126
fontWeight: 500,
117127
overflow: "hidden",
118128
textOverflow: "ellipsis",

0 commit comments

Comments
 (0)