Merge branch 'gas_status' into staging_environment
This commit is contained in:
commit
a5c9fc5b76
1 changed files with 7 additions and 6 deletions
|
|
@ -60,14 +60,14 @@ const useStyles = makeStyles((theme: Theme) => {
|
|||
margin: theme.spacing(1),
|
||||
marginLeft: theme.spacing(2),
|
||||
display: "flex",
|
||||
width: theme.spacing(32)
|
||||
// width: theme.spacing(26)
|
||||
// justifyContent: "center",
|
||||
},
|
||||
tagsCellContainer: {
|
||||
margin: theme.spacing(1),
|
||||
marginLeft: theme.spacing(2),
|
||||
display: "flex",
|
||||
width: theme.spacing(24)
|
||||
width: theme.spacing(18)
|
||||
// justifyContent: "center",
|
||||
},
|
||||
green: {
|
||||
|
|
@ -408,12 +408,13 @@ export default function Devices() {
|
|||
title: "Description",
|
||||
render: (device: Device) => {
|
||||
const description = device.settings?.description ?? ""
|
||||
let size = (hasCo2 && !groupGas) ? 26 : 36
|
||||
return (
|
||||
<Box className={classes.descriptionCellContainer}>
|
||||
<Tooltip title={device.settings?.description}>
|
||||
<Box className={classes.descriptionCellContainer} width={size*6}>
|
||||
<Tooltip title={description}>
|
||||
<span>
|
||||
{description.length > 36
|
||||
? description.substring(0, 36) + "..."
|
||||
{description.length > size
|
||||
? description.substring(0, size) + "..."
|
||||
: description}
|
||||
</span>
|
||||
</Tooltip>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue