Skip to content

Commit 8ee4bc0

Browse files
authored
Merge pull request #1734 from webdev403/fix/ui-issues-in-my-pools
Fix: UI issues in my pools section
2 parents 27779e5 + 08fdb4d commit 8ee4bc0

File tree

8 files changed

+44
-14
lines changed

8 files changed

+44
-14
lines changed

src/pages/PoolsPage/v3/MyDefiedgePoolsV3/DefiedgeLPItemDetails/index.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use 'styles/variables' as *;
22
@use 'styles/breakpoints' as *;
33

4-
.gamma-liquidity-item-buttons {
4+
.defiedge-liquidity-item-buttons {
55
display: flex;
66
justify-content: space-between;
77
flex-wrap: wrap;
@@ -16,7 +16,7 @@
1616
}
1717
}
1818

19-
.gamma-liquidity-item-button {
20-
height: 48px;
21-
border-radius: 16px;
19+
.defiedge-liquidity-item-button {
20+
height: 38px;
21+
border-radius: 10px;
2222
}

src/pages/PoolsPage/v3/MyDefiedgePoolsV3/DefiedgeLPItemDetails/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ const DefiedgeLPItemDetails: React.FC<{ defiedgePosition: any }> = ({
8989
<small>{balance1 ? formatNumber(balance1) : 0}</small>
9090
</Box>
9191
</Box>
92-
<Box mt={2} className='gamma-liquidity-item-buttons'>
92+
<Box mt={2} className='defiedge-liquidity-item-buttons'>
9393
<Button
94-
className='gamma-liquidity-item-button'
94+
className='defiedge-liquidity-item-button'
9595
onClick={() => setShowAddLPModal(true)}
9696
>
9797
<small>{t('addLiquidity')}</small>
9898
</Button>
9999
<Button
100-
className='gamma-liquidity-item-button'
100+
className='defiedge-liquidity-item-button'
101101
onClick={() => setShowWithdrawModal(true)}
102102
disabled={defiedgePosition.lpAmount <= 0}
103103
>

src/pages/PoolsPage/v3/MyGammaPoolsV3/GammaLPItem/index.scss

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
background-color: $secondary1;
66
padding: 20px;
77
border-radius: 10px;
8+
position: relative;
89
margin-top: 16px;
910
@include media('screen', '<phone') {
1011
padding: 16px 12px;
@@ -21,7 +22,16 @@
2122
}
2223

2324
.gamma-liquidity-item-expand {
24-
cursor: pointer;
25+
position: absolute;
2526
width: 24px;
2627
height: 24px;
28+
display: flex;
29+
align-items: center;
30+
justify-content: center;
31+
border-radius: 12px;
32+
background-color: $primaryLight;
33+
color: $primary;
34+
right: 20px;
35+
top: 20px;
36+
cursor: pointer;
2737
}

src/pages/PoolsPage/v3/MyICHIPools/ICHILPItem/index.scss

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
background-color: $secondary1;
66
padding: 20px;
77
border-radius: 10px;
8+
position: relative;
89
margin-top: 16px;
910
@include media('screen', '<phone') {
1011
padding: 16px 12px;
@@ -21,7 +22,16 @@
2122
}
2223

2324
.ichi-liquidity-item-expand {
24-
cursor: pointer;
25+
position: absolute;
2526
width: 24px;
2627
height: 24px;
28+
display: flex;
29+
align-items: center;
30+
justify-content: center;
31+
border-radius: 12px;
32+
background-color: $primaryLight;
33+
color: $primary;
34+
right: 20px;
35+
top: 20px;
36+
cursor: pointer;
2737
}

src/pages/PoolsPage/v3/MyQuickswapPoolsV3/components/PositionList/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default function PositionList({
4242
}, [positions]);
4343

4444
return (
45-
<Box mb={-2}>
45+
<Box>
4646
{_positionsOnOldFarming.map((p) => {
4747
return (
4848
<Box mb={2} key={p.tokenId.toString()}>

src/pages/PoolsPage/v3/MySteerPoolsV3/SteerLPItem/index.scss

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
background-color: $secondary1;
66
padding: 20px;
77
border-radius: 10px;
8+
position: relative;
89
margin-top: 16px;
910
@include media('screen', '<phone') {
1011
padding: 16px 12px;
@@ -21,7 +22,16 @@
2122
}
2223

2324
.steer-liquidity-item-expand {
24-
cursor: pointer;
25+
position: absolute;
2526
width: 24px;
2627
height: 24px;
28+
display: flex;
29+
align-items: center;
30+
justify-content: center;
31+
border-radius: 12px;
32+
background-color: $primaryLight;
33+
color: $primary;
34+
right: 20px;
35+
top: 20px;
36+
cursor: pointer;
2737
}

src/pages/PoolsPage/v3/MySteerPoolsV3/SteerLPItemDetails/index.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
}
1818

1919
.steer-liquidity-item-button {
20-
height: 48px;
21-
border-radius: 16px;
20+
height: 38px;
21+
border-radius: 10px;
2222
}

src/pages/PoolsPage/v3/MySteerPoolsV3/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default function MySteerPoolsV3({ isForAll }: { isForAll?: boolean }) {
1919
return (
2020
<>
2121
{steerPositions && steerPositions.length > 0 ? (
22-
<Box style={{ marginTop: '32px' }}>
22+
<Box>
2323
{steerPositions.map((position, index) => (
2424
<SteerLPItem key={index} position={position} />
2525
))}

0 commit comments

Comments
 (0)