From 089da62e3b6a469bbb527e627b334edb3b7b0ca9 Mon Sep 17 00:00:00 2001 From: Jaco Date: Tue, 27 Dec 2022 10:08:04 +0200 Subject: [PATCH] Adjust account table layouts (#8637) --- .../page-accounts/src/Accounts/Account.tsx | 1 - packages/page-accounts/src/Accounts/index.tsx | 21 +++++++------------ .../page-referenda/src/Referenda/Group.tsx | 9 +------- packages/react-components/src/Table/Head.tsx | 8 ++++++- packages/react-components/src/Table/index.tsx | 9 ++++++++ 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/packages/page-accounts/src/Accounts/Account.tsx b/packages/page-accounts/src/Accounts/Account.tsx index 27cae336c7..6bea6bdedc 100644 --- a/packages/page-accounts/src/Accounts/Account.tsx +++ b/packages/page-accounts/src/Accounts/Account.tsx @@ -750,7 +750,6 @@ function Account ({ account: { address, meta }, className = '', delegation, filt - void)?][]> => { const ret: Record void)?][]> = { - accounts: [[t('accounts')]], - hardware: [[t('hardware')]], - injected: [[t('extension')]], - multisig: [[t('multisig')]], - proxied: [[t('proxied')]], - qr: [[t('via qr')]], - testing: [[t('development')]] + accounts: [[<>{t('accounts')}
{t('all locally stored accounts')}
]], + hardware: [[<>{t('hardware')}
{t('accounts managed via hardware devices')}
]], + injected: [[<>{t('extension')}
{t('accounts available via browser extensions')}
]], + multisig: [[<>{t('multisig')}
{t('on-chain multisig accounts')}
]], + proxied: [[<>{t('proxied')}
{t('on-chain proxied accounts')}
]], + qr: [[<>{t('via qr')}
{t('accounts available via mobile devices')}
]], + testing: [[<>{t('development')}
{t('accounts derived via development seeds')}
]] }; Object.values(ret).forEach((a): void => { a[0][1] = 'start'; - a[0][2] = 2; - - a.push( - [undefined, 'balances'], - [] - ); + a[0][2] = 4; }); return ret; diff --git a/packages/page-referenda/src/Referenda/Group.tsx b/packages/page-referenda/src/Referenda/Group.tsx index a4bf636e96..fd4a6939ca 100644 --- a/packages/page-referenda/src/Referenda/Group.tsx +++ b/packages/page-referenda/src/Referenda/Group.tsx @@ -55,7 +55,7 @@ function Group ({ activeIssuance, className, isMember, members, palletReferenda, const [header, key] = useMemo( () => [ [ - [trackName ? <>{trackName}
{trackInfo?.text}
: t('referenda'), 'start', 5], + [trackName ? <>{trackName}
{trackInfo?.text}
: t('referenda'), 'start', 5], [undefined, 'number', 3], [headerButton] ], @@ -93,13 +93,6 @@ function Group ({ activeIssuance, className, isMember, members, palletReferenda, } export default React.memo(styled(Group)` - th > h1 > div { - display: inline-block; - font-size: 1rem; - padding-left: 1.5rem; - text-overflow: ellipsis; - } - th.number h1 { display: inline-block; opacity: 0.75; diff --git a/packages/react-components/src/Table/Head.tsx b/packages/react-components/src/Table/Head.tsx index ffa8cdb803..1cc8ac4454 100644 --- a/packages/react-components/src/Table/Head.tsx +++ b/packages/react-components/src/Table/Head.tsx @@ -59,7 +59,6 @@ function Head ({ children, className = '', filter, header, isEmpty }: Props): Re } export default React.memo(styled(Head)` - position: relative; z-index: 1; th { @@ -83,6 +82,13 @@ export default React.memo(styled(Head)` margin-right: 0.5rem; vertical-align: middle; } + + .sub { + display: inline-block; + font-size: 1rem; + padding-left: 1.5rem; + text-overflow: ellipsis; + } } &:first-child { diff --git a/packages/react-components/src/Table/index.tsx b/packages/react-components/src/Table/index.tsx index 05b87f8089..9faf0bc37a 100644 --- a/packages/react-components/src/Table/index.tsx +++ b/packages/react-components/src/Table/index.tsx @@ -146,6 +146,15 @@ export default React.memo(styled(Table)` } } + tbody, thead { + position: relative; + width: 100%; + + tr { + width: 100%; + } + } + tbody { position: relative;