test(my-joy-beta): fix failed merge
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
@ -41,7 +41,6 @@ export const Item = ({
|
|||||||
created,
|
created,
|
||||||
onStart,
|
onStart,
|
||||||
onRemove,
|
onRemove,
|
||||||
updated,
|
|
||||||
mutating
|
mutating
|
||||||
}) => (
|
}) => (
|
||||||
<TableTr>
|
<TableTr>
|
||||||
@ -62,9 +61,6 @@ export const Item = ({
|
|||||||
<TableTd xs="0" sm="160" middle left>
|
<TableTd xs="0" sm="160" middle left>
|
||||||
{distanceInWordsToNow(created)}
|
{distanceInWordsToNow(created)}
|
||||||
</TableTd>
|
</TableTd>
|
||||||
<TableTd xs="0" sm="160" middle left>
|
|
||||||
{distanceInWordsToNow(updated)}
|
|
||||||
</TableTd>
|
|
||||||
<PopoverContainer clickable>
|
<PopoverContainer clickable>
|
||||||
<TableTd padding="0" hasBorder="left">
|
<TableTd padding="0" hasBorder="left">
|
||||||
<PopoverTarget box>
|
<PopoverTarget box>
|
||||||
@ -161,18 +157,6 @@ export default ({
|
|||||||
>
|
>
|
||||||
<span>Created </span>
|
<span>Created </span>
|
||||||
</TableTh>
|
</TableTh>
|
||||||
<TableTh
|
|
||||||
xs="0"
|
|
||||||
sm="160"
|
|
||||||
onClick={() => onSortBy('updated', sortOrder)}
|
|
||||||
sortOrder={sortOrder}
|
|
||||||
showSort={sortBy === 'updated'}
|
|
||||||
left
|
|
||||||
middle
|
|
||||||
actionable
|
|
||||||
>
|
|
||||||
<span>Updated </span>
|
|
||||||
</TableTh>
|
|
||||||
<TableTh xs="60" padding="0" />
|
<TableTh xs="60" padding="0" />
|
||||||
</TableTr>
|
</TableTr>
|
||||||
</TableThead>
|
</TableThead>
|
||||||
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |