Skip to content

Commit

Permalink
Merge pull request #463 from primitivefinance/develop
Browse files Browse the repository at this point in the history
Release PR with minor updates
  • Loading branch information
zachdt authored Jan 29, 2021
2 parents cf68838 + e65ec18 commit fc902d3
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 17 deletions.
21 changes: 10 additions & 11 deletions src/components/Liquidity/LiquidityHeader/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@ const LiquidityHeader: React.FC<MarketHeaderProps> = ({
return (
<StyledHeader>
<Spacer />
<LitContainer>
<StyledTitle>
<StyledName>Liquidity Pools</StyledName>
<Spacer />
{children}
<Spacer />
<Spacer />
</StyledTitle>
</LitContainer>
<StyledTitle>
<StyledName>Liquidity Pools</StyledName>
<Spacer />
{children}
<Spacer />
<Spacer />
</StyledTitle>
<Reverse />
</StyledHeader>
)
Expand All @@ -38,16 +36,17 @@ const Reverse = styled.div`

const StyledHeader = styled.div`
padding-bottom: ${(props) => props.theme.spacing[4]}px;
margin-left: 2em;
display: block;
margin-left: -15em;
margin-right: 1em;
margin-top: -1em;
`

const StyledTitle = styled.div`
align-items: center;
display: flex;
flex-direction: row;
color: ${(props) => props.theme.color.white};
display: flex;
margin-top: ${(props) => props.theme.spacing[2]}px;
justify-content: flex-start;
`
Expand Down
7 changes: 3 additions & 4 deletions src/components/Liquidity/LiquidityTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,11 @@ export const LiquidityTableContent = styled.div`
width: 1200px;
`

const ScrollBody = styled(TableBody)`
height: 10em;
`
const ScrollBody = styled(TableBody)``

const OptionsContainer = styled.div`
display: block;
display: flex;
flex-direction: column;
margin-left: 3em;
margin-top: 0em;
min-height: 80vh;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ const AddLiquidity: React.FC = () => {
full
size="sm"
onClick={() => {}}
text={`Confirm`}
text={`Confirm Transaction`}
/>
</Box>
</div>
Expand Down Expand Up @@ -520,7 +520,7 @@ const AddLiquidity: React.FC = () => {
full
size="sm"
onClick={handleSubmitClick}
text={'Confirm'}
text={'Confirm Transaction'}
/>
</>
)}
Expand Down

1 comment on commit fc902d3

@vercel
Copy link

@vercel vercel bot commented on fc902d3 Jan 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.