brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'gas_status' into staging_environment

Browse source
This commit is contained in:
Carter 2025-05-26 09:43:26 -06:00
commit a5c9fc5b76
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/pages/Devices.tsx
View file

@ -60,14 +60,14 @@ const useStyles = makeStyles((theme: Theme) => {
margin: theme.spacing(1), margin: theme.spacing(1),
marginLeft: theme.spacing(2), marginLeft: theme.spacing(2),
display: "flex", display: "flex",
width: theme.spacing(32) // width: theme.spacing(26)
// justifyContent: "center", // justifyContent: "center",
}, },
tagsCellContainer: { tagsCellContainer: {
margin: theme.spacing(1), margin: theme.spacing(1),
marginLeft: theme.spacing(2), marginLeft: theme.spacing(2),
display: "flex", display: "flex",
width: theme.spacing(24) width: theme.spacing(18)
// justifyContent: "center", // justifyContent: "center",
}, },
green: { green: {
@ -408,12 +408,13 @@ export default function Devices() {
title: "Description", title: "Description",
render: (device: Device) => { render: (device: Device) => {
const description = device.settings?.description ?? "" const description = device.settings?.description ?? ""
let size = (hasCo2 && !groupGas) ? 26 : 36
return ( return (
<Box className={classes.descriptionCellContainer}> <Box className={classes.descriptionCellContainer} width={size*6}>
<Tooltip title={device.settings?.description}> <Tooltip title={description}>
<span> <span>
{description.length > 36 {description.length > size
? description.substring(0, 36) + "..." ? description.substring(0, size) + "..."
: description} : description}
</span> </span>
</Tooltip> </Tooltip>