Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

Wording change and CSS cleanup. #2170

Merged
merged 2 commits into from
Jan 17, 2022
Merged

Wording change and CSS cleanup. #2170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87d8391
Wording change and CSS cleanup.
Jan 17, 2022
4b5667b
Style update + hide approve button for ETH. (#2171)
fairlighteth Jan 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/custom/pages/Claim/ClaimsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ const ClaimsTableRow = ({
<TokenLogo symbol={`${currencyAmount?.currency?.symbol}`} size={32} />
<CowProtocolLogo size={32} />
<span>
<b>Buy vCOW</b>
<i>{isFree ? ClaimType[type] : `with ${currencyAmount?.currency?.symbol}`}</i>
<b>{isFree ? ClaimType[type] : 'Buy vCOW'}</b>
{!isFree && <i>with {currencyAmount?.currency?.symbol}</i>}
</span>
</td>
<td>{formatSmart(claimAmount) || 0} vCOW</td>
Expand Down
23 changes: 13 additions & 10 deletions src/custom/pages/Claim/InvestmentFlow/InvestOption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ export default function InvestOption({ approveData, updateInvestAmount, claim }:
return (
<InvestTokenGroup>
<div>
<h3>Buy vCOW with {currencyAmount?.currency?.symbol}</h3>
<span>
<TokenLogo symbol={currencyAmount?.currency?.symbol || '-'} size={72} />
<CowProtocolLogo size={72} />
</span>
<h3>Buy vCOW with {currencyAmount?.currency?.symbol}</h3>
</div>

<span>
Expand All @@ -110,6 +110,14 @@ export default function InvestOption({ approveData, updateInvestAmount, claim }:
{formatSmart(price)} vCoW per {currencyAmount?.currency?.symbol}
</i>
</span>

<span>
<b>Max. investment available</b>{' '}
<i>
{formatSmart(maxCost) || '0'} {currencyAmount?.currency?.symbol}
</i>
</span>

<span>
<b>Token approval</b>
{approveData ? (
Expand All @@ -131,7 +139,7 @@ export default function InvestOption({ approveData, updateInvestAmount, claim }:
</i>
)}
{/* Approve button - @biocom styles for this found in ./styled > InputSummary > ${ButtonPrimary}*/}
{approveState !== ApprovalState.APPROVED && (
{approveData && approveState !== ApprovalState.APPROVED && (
<ButtonConfirmed
buttonSize={ButtonSize.SMALL}
onClick={handleApprove}
Expand All @@ -142,18 +150,13 @@ export default function InvestOption({ approveData, updateInvestAmount, claim }:
>
{approving || approveState === ApprovalState.PENDING ? (
<Loader stroke="white" />
) : (
) : approveData ? (
<span>Approve {currencyAmount?.currency?.symbol}</span>
)}
) : null}
</ButtonConfirmed>
)}
</span>
<span>
<b>Max. investment available</b>{' '}
<i>
{formatSmart(maxCost) || '0'} {currencyAmount?.currency?.symbol}
</i>
</span>

<span>
<b>Available investment used</b>

Expand Down
46 changes: 22 additions & 24 deletions src/custom/pages/Claim/styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ import { ButtonPrimary, ButtonSecondary } from 'components/Button'
import { transparentize, darken } from 'polished'

export const PageWrapper = styled.div`
--color-tl: #141722;
--color-tr: #3b4052;
--color-grey: rgb(151, 151, 151);
--color-orange: rgb(237, 104, 52);
--color-container-bg: rgb(255 255 255 / 6%);
--color-container-bg2: rgb(255 255 255 / 12%);
--color-container-bg3: rgb(255 255 255 / 25%);
--border-radius: 56px;
--border-radius-small: 16px;
display: flex;
Expand Down Expand Up @@ -47,26 +40,23 @@ export const PageWrapper = styled.div`
cursor: pointer;
border: 1px solid var(--bc, var(--border));
background: var(--b, var(--background));
transition: background .2s, border-color .2s, box-shadow .2s;

&:after {
content: '';
display: block;
left: 0;
top: 0;
position: absolute;
transition: transform var(.2s) var(--d-t-e, ease), opacity var(.2s);
}

&:checked {
--b: var(--active);
--bc: var(--active);
--d-t-e: cubic-bezier(.2, .85, .32, 1.2);
}

&:disabled {
cursor: not-allowed;
opacity: .7;
opacity: .5;

&:checked {
}
Expand Down Expand Up @@ -167,10 +157,6 @@ export const PageWrapper = styled.div`
opacity: 0;
transform: scale(var(--s, .7));
}

&:checked {
--s: .5;
}
}
}

Expand Down Expand Up @@ -310,7 +296,7 @@ export const ClaimTable = styled.div`
border-collapse: collapse;
min-width: 100%;
font-size: 16px;
grid-template-columns: min-content auto max-content auto;
grid-template-columns: min-content auto auto auto;
}

thead,
Expand All @@ -335,7 +321,7 @@ export const ClaimTable = styled.div`
background: transparent;
text-align: left;
font-weight: normal;
font-size: 13px;
font-size: 15px;
color: ${({ theme }) => theme.text1};
position: relative;
}
Expand Down Expand Up @@ -448,7 +434,7 @@ export const ClaimAccount = styled.div`
width: 46px;
border-radius: 46px;
object-fit: contain;
background-color: var(--color-grey);
background-color: grey;
}

> div > p {
Expand Down Expand Up @@ -680,6 +666,12 @@ export const ClaimBreakdown = styled.div`
display: flex;
width: 100%;
flex-flow: column wrap;

> h2 {
font-size: 28px;
font-weight: 500;
text-align: center;
}
`

export const FooterNavButtons = styled.div`
Expand Down Expand Up @@ -738,6 +730,12 @@ export const Demo = styled(ClaimTable)`
export const InvestFlow = styled.div`
display: flex;
flex-flow: column wrap;

h1 {
font-size: 28px;
font-weight: 500;
text-align: center;
}
`

export const InvestContent = styled.div`
Expand All @@ -753,7 +751,7 @@ export const StepIndicator = styled.div`
export const Steps = styled.div<{ step: number | 0 }>`
list-style-type: decimal;
margin: 0 0 12px;
background: var(--color-container-bg);
background: grey;
padding: 12px;
border-radius: 12px;
display: grid;
Expand Down Expand Up @@ -868,7 +866,7 @@ export const InvestAvailableBar = styled.div<{ percentage?: number }>`
position: relative;
height: 10px;
border-radius: 24px;
background: var(--color-container-bg2);
background: grey;
margin: 8px 0;

&::before {
Expand All @@ -893,20 +891,20 @@ export const InvestSummary = styled.div`
display: grid;
grid-template-columns: auto auto;
font-size: 15px;
gap: 12px;
gap: 16px 36px;

> span {
display: flex;
flex-flow: column wrap;
margin: 0 0 12px;
color: ${({ theme }) => transparentize(0.1, theme.text1)};
gap: 3px;
}

> span > ${ButtonPrimary} {
margin: 12px 0;
margin: 12px 0 12px -9px;
padding: 6px;
font-size: 16px;
max-width: 154px;
}

> span > i {
Expand Down Expand Up @@ -937,7 +935,7 @@ export const InvestTokenSubtotal = styled.div`
display: flex;
padding: 56px;
margin: 0 0 24px;
background: var(--color-container-bg3);
background: grey;
color: ${({ theme }) => theme.text1};
border-radius: var(--border-radius);
font-size: 21px;
Expand Down