LaconicNetwork/mars-v2-frontend
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/mars-protocol/mars-v2-frontend into develop

Browse Source 
# Conflicts:
#	src/components/Button/DropDownButton.tsx
#	src/components/HLS/Staking/Table/Columns/Manage.tsx
This commit is contained in:
Linkie Link 2023-11-10 14:17:30 +01:00
commit d521c1b54e
No known key found for this signature in database
GPG Key ID: 5318B0F2564D38EA
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/components/Account/Health/HealthBar.tsx
View File

@ -87,44 +87,44 @@ export default function HealthBar({
<rect fill='#FFFFFF' x='95.5' width='88.5' height={height} />
</mask>
<mask id='backgroundHealthBarMask'>
<rect fill='#FFFFFF' x='0' y='0' width='6.4' height='{height}' />
<rect fill='#FFFFFF' x='8.9' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='13.7' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='18.5' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='23.3' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='28.1' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='32.9' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='37.7' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='42.5' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='47.3' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='52.1' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='56.9' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='61.7' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='66.5' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='71.3' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='76.1' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='80.9' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='85.7' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='90.5' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='95.3' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='100.1' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='104.9' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='109.7' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='114.5' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='119.2' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='124' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='128.8' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='133.6' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='138.4' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='143.2' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='148' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='152.8' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='157.6' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='162.4' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='167.2' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='172' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='176.8' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='181.6' y='0' width='2.4' height='{height}' />
<rect fill='#FFFFFF' x='0' y='0' width='6.4' height={height} />
<rect fill='#FFFFFF' x='8.9' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='13.7' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='18.5' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='23.3' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='28.1' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='32.9' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='37.7' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='42.5' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='47.3' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='52.1' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='56.9' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='61.7' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='66.5' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='71.3' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='76.1' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='80.9' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='85.7' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='90.5' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='95.3' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='100.1' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='104.9' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='109.7' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='114.5' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='119.2' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='124' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='128.8' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='133.6' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='138.4' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='143.2' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='148' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='152.8' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='157.6' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='162.4' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='167.2' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='172' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='176.8' y='0' width='2.4' height={height} />
<rect fill='#FFFFFF' x='181.6' y='0' width='2.4' height={height} />
</mask>
<rect
className='fill-white/10'

2
src/components/Button/DropDownButton.tsx
View File

@ -52,7 +52,7 @@ function DropDownItem(props: DropDownItem) {
onClick={props.onClick}
className=' px-4 py-3 flex gap-2 items-center hover:bg-white/5 w-full [&:not(:last-child)]:border-b border-white/10'
>
<div className='h-5 w-5 flex justify-center'>{props.icon}</div>
<div className='flex justify-center w-5 h-5'>{props.icon}</div>
<Text size='sm'>{props.text}</Text>
</button>
)