prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Padding at bottom, rounded corners when editing top/bottom labels

Browse source
This commit is contained in:
Jackson Harper 2022-04-05 16:30:12 -07:00
parent cdd950f1a7
commit b403be51a8
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/web/pages/settings/emails.tsx
View file

@ -417,6 +417,7 @@ export default function EmailsPage(): JSX.Element {
)
})}
</VStack>
<Box css={{ height: '120px' }} />
</PrimaryLayout>
)
}

21
packages/web/pages/settings/labels.tsx
View file

@ -354,6 +354,8 @@ export default function LabelsPage(): JSX.Element {
labelColorHex={labelColorHex}
editingLabelId={editingLabelId}
isCreateMode={isCreateMode}
isLastChild={isLastChild}
isFirstChild={isFirstChild}
handleGenerateRandomColor={handleGenerateRandomColor}
setEditingLabelId={setEditingLabelId}
setLabelColorHex={setLabelColorHex}
@ -395,6 +397,7 @@ export default function LabelsPage(): JSX.Element {
)
}) : null}
</VStack>
<Box css={{ height: '120px' }} />
</PrimaryLayout>
)
}
@ -486,7 +489,7 @@ function GenericTableCard(props: GenericTableCardProps & { isLastChild?: boolean
}
return (
<TableCard
<TableCard
css={{
'&:hover': {
background: 'rgba(255, 234, 159, 0.12)',
@ -528,7 +531,7 @@ function GenericTableCard(props: GenericTableCardProps & { isLastChild?: boolean
}}
>
{(showInput && !label) ? null : (
<HStack alignment="center" css={{ ml: '16px' }}>
<HStack alignment="center" css={{ ml: '16px', '@smDown': { ml: '6px' } }}>
<LabelChip color={labelColor || ''} text={label?.name || ''} />
</HStack>
)}
@ -730,7 +733,9 @@ function MobileEditCard(props: any) {
setDescriptionInputText,
createLabel,
resetState,
updateLabel
updateLabel,
isFirstChild,
isLastChild,
} = props
const handleEdit = () => {
@ -739,10 +744,16 @@ function MobileEditCard(props: any) {
}
return (
<TableCard>
<TableCard
css={{
borderTopLeftRadius: isFirstChild ? '5px' : '',
borderTopRightRadius: isFirstChild ? '5px' : '',
borderBottomLeftRadius: isLastChild ? '5px' : '',
borderBottomRightRadius: isLastChild ? '5px' : '',
}}>
<VStack distribution="center" css={{ width: '100%', margin: '8px' }}>
{nameInputText && (
<SpanBox css={{ ml: '13px', mt: '1px' }}>
<SpanBox css={{ ml: '-1px', mt: '1px' }}>
<LabelChip color={labelColorHex.value} text={nameInputText} />
</SpanBox>
)}