Skip to content

Commit

Permalink
fix: align glasses
Browse files Browse the repository at this point in the history
  • Loading branch information
daniele-mng authored and bjoernricks committed Jan 9, 2025
1 parent 1635e00 commit 341793b
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 15 deletions.
23 changes: 13 additions & 10 deletions src/web/entities/entitynametabledata.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ const EntityNameTableData = ({
children,
onToggleDetailsClick,
}) => (
<TableData flex="column">
<Layout align="space-between">
<Layout flex="column">
<TableData>
<Layout align={'space-between'} columns={2}>
<div>
{entity.isOrphan() && <b>{_('Orphan')}</b>}
{isDefined(onToggleDetailsClick) ? (
<span>
Expand All @@ -45,19 +45,22 @@ const EntityNameTableData = ({
{entity.deprecated && <b> ({_('Deprecated')})</b>}
</span>
)}
{isDefined(entity.comment) && <Comment>({entity.comment})</Comment>}
{children}
</div>
<Layout alignItems="center">
<ObserverIcon
displayName={displayName}
entity={entity}
userName={username}
/>
</Layout>
<ObserverIcon
displayName={displayName}
entity={entity}
userName={username}
/>
</Layout>
{isDefined(entity.comment) && <Comment>({entity.comment})</Comment>}
{children}
</TableData>
);

EntityNameTableData.propTypes = {
children: PropTypes.node,
displayName: PropTypes.string.isRequired,
entity: PropTypes.model.isRequired,
links: PropTypes.bool,
Expand Down
12 changes: 7 additions & 5 deletions src/web/pages/tasks/row.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,13 @@ const Row = ({
return (
<TableRow>
<TableData>
<Layout align="space-between">
<RowDetailsToggle name={entity.id} onClick={onToggleDetailsClick}>
{entity.name}
</RowDetailsToggle>
<Layout align={'space-between'} columns={2}>
<div>
<RowDetailsToggle name={entity.id} onClick={onToggleDetailsClick}>
{entity.name}
</RowDetailsToggle>
{entity.comment && <Comment>({entity.comment})</Comment>}
</div>
<IconDivider>
{entity.alterable === 1 && (
<AlterableIcon size="small" title={_('Task is alterable')} />
Expand Down Expand Up @@ -129,7 +132,6 @@ const Row = ({
)}
</IconDivider>
</Layout>
{entity.comment && <Comment>({entity.comment})</Comment>}
</TableData>
<TableData>
<TaskStatus links={links} task={entity} />
Expand Down

0 comments on commit 341793b

Please sign in to comment.