Skip to content

Commit 236dc6e

Browse files
committed
fix: align glasses
1 parent 1635e00 commit 236dc6e

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

src/web/entities/entitynametabledata.jsx

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ const EntityNameTableData = ({
2626
children,
2727
onToggleDetailsClick,
2828
}) => (
29-
<TableData flex="column">
30-
<Layout align="space-between">
31-
<Layout flex="column">
29+
<TableData>
30+
<Layout align={'space-between'} columns={2}>
31+
<div>
3232
{entity.isOrphan() && <b>{_('Orphan')}</b>}
3333
{isDefined(onToggleDetailsClick) ? (
3434
<span>
@@ -45,19 +45,22 @@ const EntityNameTableData = ({
4545
{entity.deprecated && <b> ({_('Deprecated')})</b>}
4646
</span>
4747
)}
48+
{isDefined(entity.comment) && <Comment>({entity.comment})</Comment>}
49+
{children}
50+
</div>
51+
<Layout alignItems="center">
52+
<ObserverIcon
53+
displayName={displayName}
54+
entity={entity}
55+
userName={username}
56+
/>
4857
</Layout>
49-
<ObserverIcon
50-
displayName={displayName}
51-
entity={entity}
52-
userName={username}
53-
/>
5458
</Layout>
55-
{isDefined(entity.comment) && <Comment>({entity.comment})</Comment>}
56-
{children}
5759
</TableData>
5860
);
5961

6062
EntityNameTableData.propTypes = {
63+
children: PropTypes.node,
6164
displayName: PropTypes.string.isRequired,
6265
entity: PropTypes.model.isRequired,
6366
links: PropTypes.bool,

src/web/pages/tasks/row.jsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,13 @@ const Row = ({
9292
return (
9393
<TableRow>
9494
<TableData>
95-
<Layout align="space-between">
96-
<RowDetailsToggle name={entity.id} onClick={onToggleDetailsClick}>
97-
{entity.name}
98-
</RowDetailsToggle>
95+
<Layout align={'space-between'} columns={2}>
96+
<div>
97+
<RowDetailsToggle name={entity.id} onClick={onToggleDetailsClick}>
98+
{entity.name}
99+
</RowDetailsToggle>
100+
{entity.comment && <Comment>({entity.comment})</Comment>}
101+
</div>
99102
<IconDivider>
100103
{entity.alterable === 1 && (
101104
<AlterableIcon size="small" title={_('Task is alterable')} />
@@ -129,7 +132,6 @@ const Row = ({
129132
)}
130133
</IconDivider>
131134
</Layout>
132-
{entity.comment && <Comment>({entity.comment})</Comment>}
133135
</TableData>
134136
<TableData>
135137
<TaskStatus links={links} task={entity} />

0 commit comments

Comments
 (0)