diff --git a/packages/page-bounties/src/Bounties.tsx b/packages/page-bounties/src/Bounties.tsx index ca011a792a..c53eeabbc8 100644 --- a/packages/page-bounties/src/Bounties.tsx +++ b/packages/page-bounties/src/Bounties.tsx @@ -45,17 +45,19 @@ function Bounties ({ className }: Props): React.ReactElement { header={headerRef.current} > {bounties && bestNumber && - bounties.sort((a, b) => b.index.cmp(a.index)) - .map(({ bounty, description, index, proposals }) => ( - - ))} + bounties + .sort((a, b) => b.index.cmp(a.index)) + .map(({ bounty, description, index, proposals }) => ( + + )) + } ); diff --git a/packages/page-bounties/src/Bounty.tsx b/packages/page-bounties/src/Bounty.tsx index 670bde0907..7340f586bc 100644 --- a/packages/page-bounties/src/Bounty.tsx +++ b/packages/page-bounties/src/Bounty.tsx @@ -64,7 +64,7 @@ function Bounty ({ bestNumber, bounty, className = '', description, index, propo return ( <> - + @@ -153,10 +153,8 @@ function Bounty ({ bestNumber, bounty, className = '', description, index, propo - - + +
{t('Proposer')}
@@ -166,8 +164,7 @@ function Bounty ({ bestNumber, bounty, className = '', description, index, propo {index.toString()}
- +
{t('Bond')}
@@ -206,6 +203,14 @@ function Bounty ({ bestNumber, bounty, className = '', description, index, propo } export default React.memo(styled(Bounty)(({ theme }: ThemeProps) => ` + &.isCollapsed { + visibility: collapse; + } + + &.isExpanded { + visibility: visible; + } + .description-column { max-width: 200px; @@ -272,11 +277,11 @@ export default React.memo(styled(Bounty)(({ theme }: ThemeProps) => ` } .label-column-right { - padding: 0 0 1.7rem; + padding: 0 0 0.75rem; } .label-column-left { - padding: 0 0 1.3rem; + padding: 0 0 0.75rem; } & .td-info-action-row { diff --git a/packages/page-bounties/src/index.tsx b/packages/page-bounties/src/index.tsx index 34555ee72c..a1624274bf 100644 --- a/packages/page-bounties/src/index.tsx +++ b/packages/page-bounties/src/index.tsx @@ -8,7 +8,7 @@ import { Tabs } from '@polkadot/react-components'; import { ThemeProps } from '@polkadot/react-components/types'; import Bounties from './Bounties'; -import { bountyBorderColor, bountyOddRowBackground } from './theme'; +import { bountyBorderColor } from './theme'; import { useTranslation } from './translate'; export { default as useCounter } from './useCounter'; @@ -75,18 +75,18 @@ export default React.memo(styled(BountiesApp)(({ theme }: ThemeProps) => ` } tbody tr { - &:nth-child(odd) { - background: ${bountyOddRowBackground[theme.theme]}; + &.noBorder td { + border-bottom: 1px solid transparent; + } + + &:nth-child(even) td { + padding: 0 1rem 1.4rem; } &:nth-child(odd) td { vertical-align: middle; } - &:nth-child(even) { - background: ${theme.bgPage}; - } - &:first-child { td { border-top: 1px solid ${bountyBorderColor[theme.theme]}; diff --git a/packages/page-bounties/src/theme.ts b/packages/page-bounties/src/theme.ts index 85c0151f4a..15e5dc99ee 100644 --- a/packages/page-bounties/src/theme.ts +++ b/packages/page-bounties/src/theme.ts @@ -8,15 +8,10 @@ type bountyTheme = { export const bountyBorderColor: bountyTheme = { // align with table - dark: '#eeecea', // '#2f313c', + dark: '#26272c', // '#2f313c', light: '#eeecea' // '#dfdfdf' }; -export const bountyOddRowBackground: bountyTheme = { - dark: '#111218', - light: '#fff' -}; - export const bountyLabelColor: bountyTheme = { dark: '#757575', light: '#8B8B8B'