From 3bbf2ab3be82a9ac8b42683543cd6c6ba0fab08f Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 11 Jun 2020 09:54:56 +0200 Subject: [PATCH] Adjust external table links (collapse if none) (#2932) --- packages/page-accounts/src/Accounts/index.tsx | 4 ++-- packages/page-accounts/src/Contacts/index.tsx | 4 ++-- packages/page-council/src/Motions/index.tsx | 3 ++- .../page-democracy/src/Overview/DispatchQueue.tsx | 4 ++-- packages/page-democracy/src/Overview/Proposals.tsx | 2 +- packages/page-democracy/src/Overview/Referendums.tsx | 2 +- packages/page-treasury/src/Overview/Proposals.tsx | 3 ++- packages/react-components/src/Table/Body.tsx | 12 ++++++++---- packages/react-components/src/Table/Head.tsx | 4 ++++ 9 files changed, 24 insertions(+), 14 deletions(-) diff --git a/packages/page-accounts/src/Accounts/index.tsx b/packages/page-accounts/src/Accounts/index.tsx index 96d825fb6c..c8badf00fb 100644 --- a/packages/page-accounts/src/Accounts/index.tsx +++ b/packages/page-accounts/src/Accounts/index.tsx @@ -132,8 +132,8 @@ function Overview ({ className = '', onStatusChange }: Props): React.ReactElemen [t('tags'), 'start'], [t('transactions'), 'ui--media-1500'], [t('balances')], - [undefined, undefined], - [undefined, 'ui--media-1400'] + [], + [undefined, 'mini ui--media-1400'] ], [t]); const footer = useMemo(() => ( diff --git a/packages/page-accounts/src/Contacts/index.tsx b/packages/page-accounts/src/Contacts/index.tsx index ca5e5c631e..7db38612a6 100644 --- a/packages/page-accounts/src/Contacts/index.tsx +++ b/packages/page-accounts/src/Contacts/index.tsx @@ -44,8 +44,8 @@ function Overview ({ className = '', onStatusChange }: Props): React.ReactElemen [t('tags'), 'start'], [t('transactions'), 'ui--media-1500'], [t('balances')], - [undefined, undefined], - [undefined, 'ui--media-1400'] + [], + [undefined, 'mini ui--media-1400'] ], [t]); const filter = useMemo(() => ( diff --git a/packages/page-council/src/Motions/index.tsx b/packages/page-council/src/Motions/index.tsx index f4d3cf07a2..bfdb4eb63a 100644 --- a/packages/page-council/src/Motions/index.tsx +++ b/packages/page-council/src/Motions/index.tsx @@ -31,7 +31,8 @@ function Proposals ({ className = '', motions, prime }: Props): React.ReactEleme [t('voting end')], [t('aye'), 'address'], [t('nay'), 'address'], - [undefined, undefined, 2] + [], + [undefined, 'mini'] ], [t]); return ( diff --git a/packages/page-democracy/src/Overview/DispatchQueue.tsx b/packages/page-democracy/src/Overview/DispatchQueue.tsx index 8444965857..9f02d89197 100644 --- a/packages/page-democracy/src/Overview/DispatchQueue.tsx +++ b/packages/page-democracy/src/Overview/DispatchQueue.tsx @@ -23,8 +23,8 @@ function DispatchQueue ({ className }: Props): React.ReactElement | null const header = useMemo(() => [ [t('dispatch queue'), 'start', 2], [t('enact')], - [undefined, undefined], - [undefined, 'ui--media-1000'] + [], + [undefined, 'mini ui--media-1000'] ], [t]); return ( diff --git a/packages/page-democracy/src/Overview/Proposals.tsx b/packages/page-democracy/src/Overview/Proposals.tsx index 82facf8454..018d5f700f 100644 --- a/packages/page-democracy/src/Overview/Proposals.tsx +++ b/packages/page-democracy/src/Overview/Proposals.tsx @@ -25,7 +25,7 @@ function Proposals ({ className }: Props): React.ReactElement { [t('proposer'), 'address'], [t('locked'), 'ui--media-1200'], [undefined, undefined, 2], - [undefined, 'ui--media-1000'] + [undefined, 'mini ui--media-1000'] ], [t]); return ( diff --git a/packages/page-democracy/src/Overview/Referendums.tsx b/packages/page-democracy/src/Overview/Referendums.tsx index 5793fa4244..82f9069350 100644 --- a/packages/page-democracy/src/Overview/Referendums.tsx +++ b/packages/page-democracy/src/Overview/Referendums.tsx @@ -26,7 +26,7 @@ function Referendums ({ className = '', referendums }: Props): React.ReactElemen [t('aye')], [t('nay')], [undefined, undefined, 2], - [undefined, 'ui--media-1000'] + [undefined, 'mini ui--media-1000'] ], [t]); return ( diff --git a/packages/page-treasury/src/Overview/Proposals.tsx b/packages/page-treasury/src/Overview/Proposals.tsx index 7fd50e63f3..0d1d68bcfa 100644 --- a/packages/page-treasury/src/Overview/Proposals.tsx +++ b/packages/page-treasury/src/Overview/Proposals.tsx @@ -35,7 +35,8 @@ function ProposalsBase ({ className = '', isApprovals, isMember, members, propos [t('beneficiary'), 'address'], [t('payment')], [t('bond')], - [undefined, undefined, 2] + [], + [undefined, 'mini'] ], [isApprovals, t]); return ( diff --git a/packages/react-components/src/Table/Body.tsx b/packages/react-components/src/Table/Body.tsx index c6d1404de2..a77a6b97e7 100644 --- a/packages/react-components/src/Table/Body.tsx +++ b/packages/react-components/src/Table/Body.tsx @@ -125,11 +125,15 @@ export default React.memo(styled(Body)` } &.mini { - max-width: 4rem; - min-width: 4rem; - padding: 0 0.75rem 0 0; - width: 4rem; + padding: 0 !important; + width: fit-content; white-space: normal; + + > div { + margin-right: 0.75rem; + max-width: 3.8rem; + min-width: 3.8rem; + } } &.favorite i.icon.isSelected { diff --git a/packages/react-components/src/Table/Head.tsx b/packages/react-components/src/Table/Head.tsx index 0bec074afc..5127031e9b 100644 --- a/packages/react-components/src/Table/Head.tsx +++ b/packages/react-components/src/Table/Head.tsx @@ -66,6 +66,10 @@ export default React.memo(styled(Head)` cursor: pointer; } + &.mini { + padding: 0 !important; + } + &.start { text-align: left; }