From 83ac8a99af2509c72f9f97c7139dd745207032c0 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 24 Mar 2020 09:37:49 +0100 Subject: [PATCH] Adjust row padding with primary addresses (#2449) * Adjust row padding (accounts) * Expander padding --- packages/page-accounts/src/Account.tsx | 2 +- packages/page-address-book/src/Address.tsx | 2 +- .../page-council/src/Overview/Candidate.tsx | 2 +- .../page-council/src/Overview/Members.tsx | 22 ++++++++----------- .../page-democracy/src/Overview/Proposal.tsx | 2 +- .../page-society/src/Overview/Candidate.tsx | 2 +- .../page-society/src/Overview/Defender.tsx | 2 +- packages/page-society/src/Overview/Member.tsx | 2 +- .../src/Actions/Account/index.tsx | 4 ++-- .../src/Overview/Address/index.tsx | 3 +-- .../page-staking/src/Overview/CurrentList.tsx | 9 ++++---- .../page-staking/src/Targets/Validator.tsx | 2 +- .../page-tech-comm/src/Overview/Members.tsx | 6 ++--- .../page-treasury/src/Overview/Proposal.tsx | 6 +++-- packages/react-components/src/Expander.tsx | 6 ++++- packages/react-components/src/Table.tsx | 2 +- 16 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/page-accounts/src/Account.tsx b/packages/page-accounts/src/Account.tsx index c207948dda..72a5f29134 100644 --- a/packages/page-accounts/src/Account.tsx +++ b/packages/page-accounts/src/Account.tsx @@ -211,7 +211,7 @@ function Account ({ address, className, filter, isFavorite, toggleFavorite }: Pr /> )} - + - + - + diff --git a/packages/page-council/src/Overview/Members.tsx b/packages/page-council/src/Overview/Members.tsx index 0d89e74b86..b2c92cbdc7 100644 --- a/packages/page-council/src/Overview/Members.tsx +++ b/packages/page-council/src/Overview/Members.tsx @@ -28,19 +28,15 @@ function Members ({ allVotes = {}, className, electionsInfo, prime }: Props): Re ? ( - {electionsInfo.members.map(([accountId, balance]): React.ReactNode => { - const isPrime = prime?.toString() === accountId.toString(); - - return ( - - ); - })} + {electionsInfo.members.map(([accountId, balance]): React.ReactNode => ( + + ))}
) diff --git a/packages/page-democracy/src/Overview/Proposal.tsx b/packages/page-democracy/src/Overview/Proposal.tsx index 8dbbc8abe1..0c8662e0b7 100644 --- a/packages/page-democracy/src/Overview/Proposal.tsx +++ b/packages/page-democracy/src/Overview/Proposal.tsx @@ -27,7 +27,7 @@ function Proposal ({ className, value: { balance, hash, index, proposal, propose return (

{formatNumber(index)}

- + diff --git a/packages/page-society/src/Overview/Candidate.tsx b/packages/page-society/src/Overview/Candidate.tsx index 67417ca4a0..88a718afa8 100644 --- a/packages/page-society/src/Overview/Candidate.tsx +++ b/packages/page-society/src/Overview/Candidate.tsx @@ -36,7 +36,7 @@ export default function Candidate ({ allMembers, isMember, ownMembers, value: { return ( - + diff --git a/packages/page-society/src/Overview/Defender.tsx b/packages/page-society/src/Overview/Defender.tsx index 129d20e2bc..687be8a4a3 100644 --- a/packages/page-society/src/Overview/Defender.tsx +++ b/packages/page-society/src/Overview/Defender.tsx @@ -39,7 +39,7 @@ export default function Defender ({ className, info, isMember, ownMembers }: Pro - diff --git a/packages/page-society/src/Overview/Member.tsx b/packages/page-society/src/Overview/Member.tsx index 3413dce10e..5f7cc7a446 100644 --- a/packages/page-society/src/Overview/Member.tsx +++ b/packages/page-society/src/Overview/Member.tsx @@ -21,7 +21,7 @@ function Member ({ className, isHead, value: { accountId, strikes } }: Props): R return ( - )} - - - - ); } + +export default React.memo(ProposalDisplay); diff --git a/packages/react-components/src/Expander.tsx b/packages/react-components/src/Expander.tsx index 71600c6bd9..25e9eeea26 100644 --- a/packages/react-components/src/Expander.tsx +++ b/packages/react-components/src/Expander.tsx @@ -50,13 +50,17 @@ export default React.memo(styled(Expander)` display: none; } + &.isExpanded .ui--Expander-contents { + margin-top: 0.5rem; + } + &.hasContent .ui--Expander-summary { cursor: pointer; } .ui--Expander-summary { display: block; - margin: 0 0 0.5rem 0; + margin: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/packages/react-components/src/Table.tsx b/packages/react-components/src/Table.tsx index e108b821d8..bbef66bc2e 100644 --- a/packages/react-components/src/Table.tsx +++ b/packages/react-components/src/Table.tsx @@ -128,7 +128,7 @@ const Memo = React.memo(styled(Table)` } &.padtop { - padding-top: 1.1rem; + padding: 0.75rem; } }
+
+ diff --git a/packages/page-staking/src/Actions/Account/index.tsx b/packages/page-staking/src/Actions/Account/index.tsx index 1fae6c31c7..5faa04e326 100644 --- a/packages/page-staking/src/Actions/Account/index.tsx +++ b/packages/page-staking/src/Actions/Account/index.tsx @@ -193,7 +193,7 @@ function Account ({ allStashes, className, isOwnStash, next, onUpdateType, rewar } + + - + diff --git a/packages/page-staking/src/Overview/CurrentList.tsx b/packages/page-staking/src/Overview/CurrentList.tsx index ecb935acb1..8270929e45 100644 --- a/packages/page-staking/src/Overview/CurrentList.tsx +++ b/packages/page-staking/src/Overview/CurrentList.tsx @@ -116,11 +116,10 @@ function CurrentList ({ authorsMap, hasQueries, isIntentions, isVisible, lastAut ); }, [stakingOverview, validators]); - const _renderRows = (addresses: AccountExtend[], defaultName: string, isMain: boolean): React.ReactNode => + const _renderRows = (addresses: AccountExtend[], isMain: boolean): React.ReactNode => addresses.map(([address, isElected, isFavorite]): React.ReactNode => (
- {_renderRows(validators, t('validators'), true)} + {_renderRows(validators, true)}
{isIntentions && ( @@ -160,8 +159,8 @@ function CurrentList ({ authorsMap, hasQueries, isIntentions, isVisible, lastAut ? ( - {_renderRows(elected, t('intention'), false)} - {_renderRows(waiting, t('intention'), false)} + {_renderRows(elected, false)} + {_renderRows(waiting, false)}
) diff --git a/packages/page-staking/src/Targets/Validator.tsx b/packages/page-staking/src/Targets/Validator.tsx index 50e103cbe0..4488a97746 100644 --- a/packages/page-staking/src/Targets/Validator.tsx +++ b/packages/page-staking/src/Targets/Validator.tsx @@ -35,7 +35,7 @@ function Validator ({ info: { accountId, bondOther, bondOwn, bondTotal, commissi toggleFavorite={toggleFavorite} />
{formatNumber(rankOverall)} + diff --git a/packages/page-tech-comm/src/Overview/Members.tsx b/packages/page-tech-comm/src/Overview/Members.tsx index e036a8b2da..67025fa59d 100644 --- a/packages/page-tech-comm/src/Overview/Members.tsx +++ b/packages/page-tech-comm/src/Overview/Members.tsx @@ -33,7 +33,7 @@ function Members ({ className, members, prime }: Props): React.ReactElement - + @@ -60,7 +60,7 @@ function Members ({ className, members, prime }: Props): React.ReactElement | null { +function ProposalDisplay ({ className, isMember, proposal: { council, id, proposal }, withSend }: Props): React.ReactElement | null { const { t } = useTranslation(); return ( @@ -29,7 +29,7 @@ export default function ProposalDisplay ({ className, isMember, proposal: { coun

{formatNumber(id)}

 + @@ -72,3 +72,5 @@ export default function ProposalDisplay ({ className, isMember, proposal: { coun