From de805f3f8bd9fcb982504dbc1f8e902e0b1d3f1d Mon Sep 17 00:00:00 2001 From: groninge Date: Fri, 30 Aug 2024 09:51:07 +0200 Subject: [PATCH 1/2] update column alignment --- .../portfolio/PortfolioTable/PortfolioTable.tsx | 4 ++-- .../PortfolioTable/PortfolioTableHeader.tsx | 2 +- .../portfolio/PortfolioTable/PortfolioTableRow.tsx | 12 +++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/modules/portfolio/PortfolioTable/PortfolioTable.tsx b/lib/modules/portfolio/PortfolioTable/PortfolioTable.tsx index 6f9a26d75..5af6e840d 100644 --- a/lib/modules/portfolio/PortfolioTable/PortfolioTable.tsx +++ b/lib/modules/portfolio/PortfolioTable/PortfolioTable.tsx @@ -48,12 +48,12 @@ export const portfolioOrderBy: { ] const numberColumnWidth = '125px' -const furthestLeftColWidth = '140px' +const furthestLeftColWidth = '110px' const rowProps = { px: [0, 4], gridTemplateColumns: `32px minmax(320px, 1fr) 100px - ${furthestLeftColWidth} ${numberColumnWidth} ${numberColumnWidth} 145px`, + ${furthestLeftColWidth} ${numberColumnWidth} ${numberColumnWidth} 160px`, alignItems: 'center', gap: { base: 'xxs', xl: 'lg' }, } diff --git a/lib/modules/portfolio/PortfolioTable/PortfolioTableHeader.tsx b/lib/modules/portfolio/PortfolioTable/PortfolioTableHeader.tsx index 9c2e9d45d..e0673c058 100644 --- a/lib/modules/portfolio/PortfolioTable/PortfolioTableHeader.tsx +++ b/lib/modules/portfolio/PortfolioTable/PortfolioTableHeader.tsx @@ -50,7 +50,7 @@ export function PortfolioTableHeader({ currentSortingObj, setCurrentSortingObj, setCurrentSortingObj({ id: orderByItem.id, desc: false }) } }} - align="right" + align={index === 0 ? 'left' : 'right'} /> ))} diff --git a/lib/modules/portfolio/PortfolioTable/PortfolioTableRow.tsx b/lib/modules/portfolio/PortfolioTable/PortfolioTableRow.tsx index 804adbac6..eaf4a5ece 100644 --- a/lib/modules/portfolio/PortfolioTable/PortfolioTableRow.tsx +++ b/lib/modules/portfolio/PortfolioTable/PortfolioTableRow.tsx @@ -75,16 +75,14 @@ export function PortfolioTableRow({ pool, keyValue, veBalBoostMap, ...rest }: Pr {getPoolTypeLabel(pool.type)} - + - - {stakingText}{' '} - + {stakingText} {/* TO-DO vebal boost */} - + - + {toCurrency(pool.poolPositionUsd, { abbreviated: false })} - + {pool.poolType === ExpandedPoolType.StakedAura ? ( pool.staking?.aura?.apr ? ( From d703f99738b76ebaeb69c3b3309cf99d49185b90 Mon Sep 17 00:00:00 2001 From: groninge Date: Fri, 30 Aug 2024 14:17:53 +0200 Subject: [PATCH 2/2] adjust widths --- lib/modules/portfolio/PortfolioTable/PortfolioTable.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/modules/portfolio/PortfolioTable/PortfolioTable.tsx b/lib/modules/portfolio/PortfolioTable/PortfolioTable.tsx index 5af6e840d..d5e8c6777 100644 --- a/lib/modules/portfolio/PortfolioTable/PortfolioTable.tsx +++ b/lib/modules/portfolio/PortfolioTable/PortfolioTable.tsx @@ -47,13 +47,9 @@ export const portfolioOrderBy: { }, ] -const numberColumnWidth = '125px' -const furthestLeftColWidth = '110px' - const rowProps = { px: [0, 4], - gridTemplateColumns: `32px minmax(320px, 1fr) 100px - ${furthestLeftColWidth} ${numberColumnWidth} ${numberColumnWidth} 160px`, + gridTemplateColumns: `32px minmax(320px, 1fr) repeat(2, 100px) 120px 130px 170px`, alignItems: 'center', gap: { base: 'xxs', xl: 'lg' }, }