Rz-(iMU|9ElL_Oe>g`i%u{%;;^Pz}frhvadgCXBN-MROM!U_6
z9mcTzXO-^x?^cgF1YomVP_Y6!hE^O`+4eb@0FO6R`j}I26ff2{q=TB2)$)=__d-t?
zKvAU&2b4sw(Dga^_*+Ww;_v%wo2p4I7n%3Vo~TB|4j9j&l3jM4WqwW#nLsB5tkLB8
z<9^j?EN5+aji_6I3Qex@|6Gvv`cVu6G)}*~?mw3K!n;hN2s&Xs1_z*wuP)7%lxKy7~#EmKwy;?X?*%cm)
zNKIw;^)IX@S7D3)_#PsyoR4#`HefJxqA7|ZvT-C?pB+E-T~`me`#_r9LVTodXR4Aq
zhzSMnY*1}u?Ft+2ZDPFV5}S`O4)CHW1&`Y0#hHK)?lDuC1~6%H2MXXACPSSh_!cmN
zr~Uubv{U%v!riyjs
zcHl1%$;*;Bjvd6^TOVlE%4A4Da;-MP4k7596uqP`{oE|#6f1f3!2hj=8&udSL7Ijb
z)>?&qjiPH#A9nkxw$j^(3ObY{@k92QoUwDKs?YoXwwc&=N)h?12_}aZKVJW}fSFO2
zTcQ4hA%{K{9wPeMw8s1fF>V|KmejJi2Z7ICMzQ-97f#BS+MLrRX_zIZ?7+?0eLIq5D}H{OddU$MZ>_
zdW(mkEBPqN>jRdT^~}rHMcqV?J@d*h*!$Y4<6+6MD(I?lNdy?>_{Cx%M<>U#{fwni
zj|ueMZ7$V!lGAJsx%}x`R5~K#N#QK%YsY=3oW(k^!0R|VMgp2Uy7Er%F(C+%$FV1Q
zy{gKePQI=)A7j%Mlo{Bp3|N^Mb^9Y?as*lr+++)*z`OH@s-TWP*LFZBegSP^h1s+8
zJv5TXdYZOY8zq>cN{i0z!ldZ8b$`zzEgnL1-bgcg)wti+wq2=#HX7+{ZmZ0I{#Db_
zaCKmbQI`i_Fx~=Q?p#F(jLDcC_QO8?6=Dt!Zwe~cm^VkFRPmx@Tlg#1no=cy0sdU$
zl`x=pBr$?Vz$6}4^HD|!qh*kN%{>RdIQljqlI+kzrg{KIbgY8)QVygBIaF^zd1yhl
z69xZJ*Q+v0VwBj+vRV(EGI4=R6HHG`*-D}ze(0If<9N7MnbFMD7o$V3
zi}yU+NMe(_JcbX_9bfThon?;m1Vwl8DV55$d|j+qeo%mTm3+cjU4483lh}P`vsvfT
z@rfG;7EO%PY22or*?}k}yjWvp%ORFR;Drl!2=7no75%J!#126V^N&KO-Ncx;>g%f#
z!nJ|vkAo-LzJ|8|4BTD;=@D^%UunRH6Sv{tpZ95TgIc~@gu_&c8V@OlR!hIAl<(12
z^EeehH*|>yB|9n9A2Ud8(8NaUMM9C9;}N71l;A!O+8XK)!@L924l4S#p7THVEuoMr
z7=1Kmx&0@h6*^_Nn^g`EbzEaNPonk2#K<~dkCCTGSHO~jeTnzB=+{E6;0;HKgjgL!
z6vjD1txzy>&5shi0UNdK+m(@S2y=YS4dkCbG;$fX4%(7AwBmg)*9(X*uVgt|s(GVw
z2A$Wk+My)GKPj_pxV8=4<6(sG_5j#v7@cD)*+~Ld*U;S1pZs6uDWk>j{=mLD%J@nw
zn2WeX>poP|`46VIMCr0Rv$mp`v3Pi@*B2Nw+N&W(@ME962L4B*Yl<-=nCT!9sO_@j
zUD)?;e>49g)U$ST#l}_^u~uDavBZGN*lbM!sSW2)@b{67Q{?&h@V|`WeQ@BaSL#D$8!A3=6RO+Uj$Do+S@c#C@1C!Adzup2~!Y8&!RoAn<
zC^}dj`a9z5$jKpw;lX*0DUX$`-Acj~D5dqVJ!MDEAxs3PWHDcjjY6c4tl`}uDIevK
ztJf7^=-^yV#GT6Va#O=5FH6B6)nLj-^Wp~XX*aFsTB-cPzfyZm^E|B;8yCJPa+k0F
zVvI}^KJyvWrb~5Pm-hNbXQx6wG86$8IohHNdd26A<;dAEv{%j4x9U
zir0XqpEcTaiQqCWmPfVWCvzDCxcTAO0KM%*x2asWxRUx~XUvL%jiaGeC)(yrJP2R?
zIgRFjG}5K=2f+`vg@$23%k)#BnK#gR!`ZN5E0O6tq;^Y^69|%@yRMb1vWbvXOS$yK5$4Ry`>pzaz*?0MSgob
zv9d<41rRx@$x*3Mr~6F5rhk>yn(!-Xi*3v40&^e{oW;?T{+x<*y^7kV8XcKP|qZ`!&k4TbhsxH3j{ClzER*&9EZYa!Nmqk%Y$wq-8`{ntKS;aV~vx=)8T?jOVE3)W8~>-
zx$ec@h5(K`_%w=M;d)MuVHZm71DX7>
z(|i!rpGd8VU!_%bJ|u1vwDkG+UZ1T}1~yijdKLHK2^R
zn00JQVpxgHh14y-Bwc5PX#O)(4>Ry_g@${7Q~ycfT9s`G+L5)R6?(k+_(IN-bWJV+
z%#9y7$Z)hEOj-4nav%Tu>e~Gu!*ZKfwC;XOGDMS*6Nk0y1kPVbfpfaph_!Swe&pe+
zhDw&UAzSg*MK)P5g)VlLUL(N^b3d)YMxGTs^Ldl*X&>$GX|vytJ7XQpGM#&k23lRZ
zb^h573#IMr(QS7SaKC|KJ{~|aY$~beB&LZ%_f~#9%dB-i!u>02m&}Axy(+j==gs6vH{@!aU?yHF$j0#Y94Tf081neM+OK={^Vt8zf%5#^
z7S3IryS-nb8`7Fi5JpyRv8f725papuH&aD-<+0JU`mEC~I_#%+dxM;5oaB~$-}zx+
zzsmm@>LXyf=6Y+#XvN8UK6LZ3spaSW?j9IOYPK5kW9)@LUrzuHrwB8$JPA<28UA*$
zo!%A&B&Sy|3$9|$VT(mqyWz7??G5eH3)u~;Y3fl(QPB&GSlS}hk^8noq!y$0T!V1p
z)F(&ouT{)|ojeNikd*4GJsM4b?B=C_<(3BjCO_?Ub&;m#pmA;Vi^<;odvce$
z{^~*A+|91!{tt$SG>QEe>ES6(t#_`q%KMgkl#g#+CM8{#IxENXIJ1aKP83LGD@q?o
zVA_MHxN|?@n7h3#habPtmPkG5llb$fFOw%3&!9Q$raOSC+mv_5D<18d&vn`dt75rz#`AfsgU
z?B~mQjTFRPYP)nE^D5*={4SN#(V)icIcg7!9;Hwzhbt`55plJ3MC4_?wLk$p9)@+O
z+t2RoW;!Y23iQI}$dUs;q10VSxAdX>asFm>BPPvK8UnY5vXTo}O>`hOe(j~A2g^(F
zQYBS{TCUALAs)0BwFP;iEX}|QFt44eeSomsEp`5Lr6uMGo#JM2Bqsy=S1K@hOK^Oo
zvM%FtTl9$*+`|{Pq{eQa3*_uQ{>BM6l*Q}CcKq?fnYh6gVu$*2=-S$Sd}T?OK1}iP
zwAM*ggRw=Vm5T;|O!XGL9$G=)6OsEkZI__n3A=!H+&qT+cS*
z$9VrO=|dUPulqFO%sGfxxikjl{3clR=+8EKuG5DtOGPYPayv?T3)A@>y_@rV=Uvq_
zhcmeCnMLonp&PH0Q;u_baB7s>Qj#1Zc(HS>@GX=V2Y#RIRqgU?Y`)+G#n*sihg?O$
zg|I(rFDi#F@1!s^^+OU_m$K6-#0dTcab=O;pElw9=<#|V=UsKVTDRp@h7Ms0v<5G+I5>4
zRm*uIpuyP-ZBQUyD@EkIYAfovBA<=lm1Q~>=g*a`i2T_*2$<5S6|gh0mTG<{w(H!1
z^cvGK(oP&^`GkiEms$XCgsTJQiDIkIYv9whIu)?Nt>%ZaiQ?oAJaDMbT>0dLN-b4<
zpZpCaU9nzN0p-g45=&lf%(o*jlw%S{(lX4x`kxkV3&mco6Cb*q>^}h_DJD=4? svg {
+ opacity: 0.5;
+ transition: opacity 0.2s ease-in-out;
+
+ &:hover {
+ opacity: 1;
+ }
+ }
+`
+
+export function HelpCircle({ size }: { size: number }) {
+ const darkMode = useIsDarkMode()
+ return (
+
+
+
+ )
+}
export const PageWrapper = styled(AppBody)`
padding: 0 24px 24px;
@@ -14,11 +37,17 @@ export const Title = styled.h1`
font-size: 32px;
margin: 24px 0 16px;
color: ${({ theme }) => theme.text1};
+
${({ theme }) => theme.mediaWidth.upToVerySmall`
font-size: 24px;
`}
`
+export const SectionTitle = styled(Title)`
+ font-size: 21px;
+ margin: 12px 0 16px;
+`
+
export const Content = styled.div`
font-size: 15px;
margin: 0 0 28px;
diff --git a/src/custom/pages/Profile/index.tsx b/src/custom/pages/Profile/index.tsx
index 56d5205a2..e26c0dcab 100644
--- a/src/custom/pages/Profile/index.tsx
+++ b/src/custom/pages/Profile/index.tsx
@@ -12,16 +12,22 @@ import {
ChildWrapper,
Loader,
ExtLink,
- ProfileWrapper,
- ProfileGridWrap,
+ CardsWrapper,
+ Card,
+ BannerCard,
+ BalanceDisplay,
+ ConvertWrapper,
} from 'pages/Profile/styled'
import { useActiveWeb3React } from 'hooks/web3'
import Copy from 'components/Copy/CopyMod'
-import { HelpCircle, RefreshCcw } from 'react-feather'
+import { RefreshCcw } from 'react-feather'
import Web3Status from 'components/Web3Status'
import useReferralLink from 'hooks/useReferralLink'
import useFetchProfile from 'hooks/useFetchProfile'
-import { formatSmartLocaleAware, numberFormatter } from 'utils/format'
+import {
+ // formatSmartLocaleAware,
+ numberFormatter,
+} from 'utils/format'
import { getExplorerAddressLink } from 'utils/explorer'
import useTimeAgo from 'hooks/useTimeAgo'
import { MouseoverTooltipContent } from 'components/Tooltip'
@@ -29,13 +35,17 @@ import NotificationBanner from 'components/NotificationBanner'
import { SupportedChainId as ChainId } from 'constants/chains'
import AffiliateStatusCheck from 'components/AffiliateStatusCheck'
import { useHasOrders } from 'api/gnosisProtocol/hooks'
-import { Title } from 'components/Page'
-import { useTokenBalance } from 'state/wallet/hooks'
-import { useVCowData } from 'state/claim/hooks'
-import { V_COW, COW } from 'constants/tokens'
-import VCOWDropdown from './VCOWDropdown'
-import { isPr, isLocal } from 'utils/environments'
-import { IS_CLAIMING_ENABLED } from 'pages/Claim/const'
+import { Title, SectionTitle, HelpCircle } from 'components/Page'
+import { ButtonPrimary } from 'custom/components/Button'
+import vCOWImage from 'assets/cow-swap/vCOW.png'
+import SVG from 'react-inlinesvg'
+import ArrowIcon from 'assets/cow-swap/arrow.svg'
+import CowImage from 'assets/cow-swap/cow_v2.svg'
+import CowProtocolImage from 'assets/cow-swap/cowprotocol.svg'
+// import { useTokenBalance } from 'state/wallet/hooks'
+// import { useVCowData } from 'state/claim/hooks'
+// import { V_COW, COW } from 'constants/tokens'
+// import { isPr, isLocal } from 'utils/environments'
export default function Profile() {
const referralLink = useReferralLink()
@@ -45,17 +55,41 @@ export default function Profile() {
const isTradesTooltipVisible = account && chainId == 1 && !!profileData?.totalTrades
const hasOrders = useHasOrders(account)
- const vCowBalance = useTokenBalance(account || undefined, chainId ? V_COW[chainId] : undefined)
- const cowBalance = useTokenBalance(account || undefined, chainId ? COW[chainId] : undefined)
+ // const vCowBalance = useTokenBalance(account || undefined, chainId ? V_COW[chainId] : undefined)
+ const vCowBalance = '10,240,800.32'
+ // const cowBalance = useTokenBalance(account || undefined, chainId ? COW[chainId] : undefined)
+ const cowBalance = '0'
- const { vested, total, unvested } = useVCowData()
+ // const { vested, total, unvested } = useVCowData()
+ const unvested = '9,240,800.32'
+ const vested = '1,240,800.32'
// TODO: remove once this is not needed anymore
- if (isPr || isLocal) {
- console.force.log('vested', formatSmartLocaleAware(vested, vested?.currency.decimals))
- console.force.log('total', formatSmartLocaleAware(total, total?.currency.decimals))
- console.force.log('unvested', formatSmartLocaleAware(unvested, unvested?.currency.decimals))
- console.force.log('cowBalance', formatSmartLocaleAware(cowBalance, cowBalance?.currency.decimals))
+ // if (isPr || isLocal) {
+ // console.force.log('vested', formatSmartLocaleAware(vested, vested?.currency.decimals))
+ // console.force.log('total', formatSmartLocaleAware(total, total?.currency.decimals))
+ // console.force.log('unvested', formatSmartLocaleAware(unvested, unvested?.currency.decimals))
+ // console.force.log('cowBalance', formatSmartLocaleAware(cowBalance, cowBalance?.currency.decimals))
+ // }
+
+ const tooltipText = {
+ balanceBreakdown: (
+
+ Unvested {unvested} vCOW Vested {vested} vCOW
+
+ ),
+ vested: (
+
+
+ Vested vCOW is the portion of your vCOW token balance, which is fully available to convert to
+ COW token.
+
+
+ This includes any vCOW received through an airdrop.
+
+
When converting your vested vCOW balance to COW, your entire vested balance will be converted.
+
+ ),
}
const renderNotificationMessages = (
@@ -76,18 +110,70 @@ export default function Profile() {
return (
{chainId && chainId === ChainId.MAINNET && }
-
-
-
- Profile
-
- {IS_CLAIMING_ENABLED && vCowBalance && }
-
-
+ Profile
+
+
+ {vCowBalance && (
+
+
+
+
+ Total vCOW balance
+
+ {vCowBalance} vCOW{' '}
+
+
+
+
+
+
+
+
+
+ Vested{' '}
+
+
+
+
+ {vested}
+
+
+ Convert to COW
+
+
+
+ )}
+
+ {cowBalance && (
+
+
+
+
+ Available COW balance
+ {cowBalance} COW
+
+
+
+ )}
+
+
+
+ CoW DAO Governance
+ Use your (v)COW balance to vote on important proposals or participate in forum discussions.
+
+ {' '}
+ View proposals ↗
+ CoW Forum ↗
+
+
+
+
+
+
- Affiliate Program
+ Affiliate Program
{account && (
diff --git a/src/custom/pages/Profile/styled.tsx b/src/custom/pages/Profile/styled.tsx
index b5ca6911b..984895b4a 100644
--- a/src/custom/pages/Profile/styled.tsx
+++ b/src/custom/pages/Profile/styled.tsx
@@ -1,5 +1,7 @@
import styled, { css } from 'styled-components/macro'
import Page, { GdocsListStyle } from 'components/Page'
+import { ButtonPrimary } from 'custom/components/Button'
+import { BannerExplainer } from 'pages/Claim/styled'
import * as CSS from 'csstype'
import { transparentize } from 'polished'
import { ExternalLink } from 'theme'
@@ -8,6 +10,7 @@ export const Container = styled.div`
max-width: 910px;
width: 100%;
`
+
export const Wrapper = styled(Page)`
${GdocsListStyle}
@@ -19,14 +22,17 @@ export const Wrapper = styled(Page)`
justify-content: flex-end;
flex-direction: column;
margin: 0;
- background: ${({ theme }) => transparentize(0.5, theme.bg1)};
+ background: ${({ theme }) => transparentize(0.3, theme.bg1)};
box-shadow: none;
border: 1px solid ${({ theme }) => theme.cardBorder};
+
${({ theme }) => theme.mediaWidth.upToSmall`
padding: 16px;
`}
+
span[role='img'] {
font-size: 55px;
+
${({ theme }) => theme.mediaWidth.upToSmall`
font-size: 30px;
`}
@@ -96,6 +102,7 @@ export const ItemTitle = styled.h3`
font-size: 18px;
line-height: 1.21;
color: ${({ theme }) => theme.text1};
+
${({ theme }) => theme.mediaWidth.upToSmall`
margin: 0 0 10px 0;
font-size: 16px;
@@ -126,11 +133,12 @@ export const FlexWrap = styled.div`
`
export const StyledContainer = styled.div`
- display: flex;
- flex:1;
- align-items:center;
- justify-content: space-between;
+ display: flex;
+ flex:1;
+ align-items:center;
+ justify-content: space-between;
}
+
${({ theme }) => theme.mediaWidth.upToSmall`
flex-wrap: wrap;
flex-direction: column;
@@ -196,15 +204,6 @@ export const Loader = styled.div<{ isLoading: boolean }>`
`}
`
-export const ProfileWrapper = styled(Wrapper)`
- margin: 16px 0 16px 0;
- padding: 16px 24px;
- z-index: 2;
- ${({ theme }) => theme.mediaWidth.upToVerySmall`
- padding: 0 16px 16px;
- `};
-`
-
export const ProfileGridWrap = styled(GridWrap)`
grid-template-columns: 1fr auto;
justify-content: space-between;
@@ -225,3 +224,232 @@ export const ProfileGridWrap = styled(GridWrap)`
grid-row-gap: 0px;
`};
`
+
+export const CardsWrapper = styled.div`
+ display: flex;
+ flex-flow: row wrap;
+ gap: 16px;
+ margin: 16px 0 16px 0;
+ padding: 0;
+ z-index: 2;
+
+ > div:nth-of-type(3n) {
+ flex: 1 1 100%;
+ }
+
+ ${({ theme }) => theme.mediaWidth.upToSmall`
+ display: flex;
+ flex-flow: column wrap;
+ `};
+`
+
+export const Card = styled.div`
+ display: flex;
+ flex-flow: row wrap;
+ flex: 1;
+ min-height: 192px;
+ margin: 0;
+ background: ${({ theme }) => transparentize(0.3, theme.bg1)};
+ box-shadow: none;
+ padding: 24px;
+ gap: 24px 0;
+ border-radius: 16px;
+ border: 1px solid ${({ theme }) => theme.cardBorder};
+
+ ${({ theme }) => theme.mediaWidth.upToSmall`
+ min-height: 130px;
+ padding: 24px 16px;
+ `};
+
+ ${ButtonPrimary} {
+ height: 52px;
+
+ > svg {
+ height: 100%;
+ width: auto;
+ object-fit: contain;
+ margin: 0 0 0 6px;
+ transform: translateX(0);
+ transition: transform 0.2s ease-in-out;
+ }
+
+ &:hover > svg {
+ transform: translateX(2px);
+ }
+ }
+`
+
+export const BannerCard = styled(BannerExplainer)`
+ min-height: 192px;
+ border-radius: 16px;
+ border: 0;
+ padding: 0 100px 0 24px;
+ flex: 1;
+ overflow: hidden;
+
+ ${({ theme }) => theme.mediaWidth.upToSmall`
+ text-align: center;
+ padding: 24px 16px;
+ `}
+
+ &:hover {
+ border: 0;
+ }
+
+ > span {
+ align-items: flex-start;
+ justify-content: space-between;
+ height: 100%;
+ padding: 24px 0;
+
+ ${({ theme }) => theme.mediaWidth.upToSmall`
+ padding: 0;
+ `}
+
+ > b {
+ font-size: 24px;
+
+ ${({ theme }) => theme.mediaWidth.upToSmall`
+ text-align: center;
+ margin: 0 auto;
+ `};
+ }
+
+ > small {
+ font-size: 14px;
+ line-height: 1.5;
+ text-align: left;
+ padding: 0;
+ margin: 8px 0 auto;
+
+ ${({ theme }) => theme.mediaWidth.upToSmall`
+ text-align: center;
+ margin: 16px auto;
+ `}
+ }
+
+ > span {
+ display: flex;
+ margin: 8px 0 0;
+ gap: 0 16px;
+ width: 100%;
+
+ ${({ theme }) => theme.mediaWidth.upToSmall`
+ flex-flow: column wrap;
+ gap: 16px 0;
+ justify-content: center;
+ margin: 24px 0 12px;
+ `}
+ }
+
+ > span > a,
+ > span > a:link {
+ font-size: 15px;
+ color: ${({ theme }) => theme.white};
+
+ &:hover {
+ color: ${({ theme }) => theme.primary1};
+ }
+ }
+ }
+
+ > svg {
+ left: initial;
+ right: -190px;
+ transform: scale(-1, 1); // flip mirror
+ opacity: 0.25;
+ mix-blend-mode: initial;
+ }
+`
+
+export const BalanceDisplay = styled.div<{ titleSize?: number; altColor?: boolean; hAlign?: string }>`
+ display: flex;
+ flex-flow: row wrap;
+ align-items: center;
+ align-content: center;
+ justify-content: ${({ hAlign }) => (hAlign === 'left' ? 'flex-start' : 'center')};
+ gap: 3px 12px;
+ width: 100%;
+ font-size: 14px;
+ color: ${({ theme }) => transparentize(0.3, theme.text1)};
+
+ ${({ theme }) => theme.mediaWidth.upToMedium`
+ gap: 12px;
+ flex-flow: column wrap;
+ `};
+
+ ${({ theme }) => theme.mediaWidth.upToSmall`
+ justify-content: center;
+ `};
+
+ > img {
+ ${({ theme }) => theme.mediaWidth.upToSmall`
+ height: 56px;
+ width: 56px;
+ object-fit: contain;
+ `};
+ }
+
+ > span {
+ display: flex;
+ flex-flow: column wrap;
+ gap: 3px 0;
+ }
+
+ i {
+ display: flex;
+ align-items: center;
+ gap: 0 3px;
+ width: 100%;
+ font-style: normal;
+
+ ${({ theme }) => theme.mediaWidth.upToMedium`
+ justify-content: center;
+ `};
+ }
+
+ b {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ gap: 0 6px;
+ color: ${({ theme, altColor }) => (altColor ? theme.primary1 : theme.text1)};
+ font-size: ${({ titleSize }) => (titleSize ? `${titleSize}px` : '21px')};
+
+ ${({ theme }) => theme.mediaWidth.upToMedium`
+ justify-content: center;
+ `};
+
+ ${({ theme }) => theme.mediaWidth.upToSmall`
+ font-size: 18px;
+ `};
+
+ > div {
+ cursor: pointer;
+ }
+
+ // Todo: Prevent requiring overriding tooltip padding with important!
+ > div > div {
+ padding: 0 !important;
+ }
+ }
+`
+
+export const ConvertWrapper = styled.div`
+ display: grid;
+ grid-template-columns: 1fr 200px;
+ align-items: center;
+ ${({ theme }) => theme.neumorphism.boxShadow};
+ background: ${({ theme }) => theme.bg7};
+ border-radius: 16px;
+ padding: 16px;
+ width: 100%;
+
+ ${({ theme }) => theme.mediaWidth.upToMedium`
+ display: flex;
+ flex-flow: column wrap;
+ gap: 16px 0;
+
+ > div { gap: 6px 12px; }
+ `};
+`
From cdc592eb96069fbc54df805a993d87a948072837 Mon Sep 17 00:00:00 2001
From: biocom
Date: Tue, 22 Mar 2022 18:32:29 +0000
Subject: [PATCH 2/4] Styled governance banner and inner card container.
---
src/custom/pages/Claim/styled.ts | 15 ++++--
src/custom/pages/Profile/styled.tsx | 73 +++++++++++++++++++++--------
src/custom/theme/baseTheme.tsx | 1 +
src/custom/theme/styled.d.ts | 1 +
4 files changed, 67 insertions(+), 23 deletions(-)
diff --git a/src/custom/pages/Claim/styled.ts b/src/custom/pages/Claim/styled.ts
index caf0667de..b75054b87 100644
--- a/src/custom/pages/Claim/styled.ts
+++ b/src/custom/pages/Claim/styled.ts
@@ -1832,7 +1832,16 @@ export const BannerExplainer = styled.div`
}
> svg {
- .stop1 { stop-color: ${({ theme }) => theme.white}}
- .stop2 { stop-color: ${({ theme }) => theme.white}; stop-opacity: 0.8;}
- .stop3 { stop-color: ${({ theme }) => theme.white}; stop-opacity: 0;}
+ .stop1 {
+ stop-color: ${({ theme }) => theme.white};
+ }
+ .stop2 {
+ stop-color: ${({ theme }) => theme.white};
+ stop-opacity: 0.8;
+ }
+ .stop3 {
+ stop-color: ${({ theme }) => theme.white};
+ stop-opacity: 0;
+ }
+ }
`
diff --git a/src/custom/pages/Profile/styled.tsx b/src/custom/pages/Profile/styled.tsx
index 984895b4a..777a34b3e 100644
--- a/src/custom/pages/Profile/styled.tsx
+++ b/src/custom/pages/Profile/styled.tsx
@@ -54,14 +54,15 @@ export const ChildWrapper = styled.div`
justify-content: center;
border-radius: 21px;
padding: 20px;
- ${({ theme }) => theme.neumorphism.boxShadow};
- background-color: ${({ theme }) => theme.bg7};
+ background-color: ${({ theme }) => theme.cardBackground};
+
${({ theme }) => theme.mediaWidth.upToSmall`
grid-column-start: 1;
grid-column-end: 2;
width: 100%;
padding: 14px;
`}
+
> .item {
width: 100%;
}
@@ -72,16 +73,17 @@ export const GridWrap = styled.div (props.horizontal ? '1fr 1fr' : '1fr')};
+
${({ theme }) => theme.mediaWidth.upToSmall`
- grid-template-columns: 1fr;
- grid-column-gap: 16px;
- grid-row-gap: 16px;
- grid-column-gap: 0;
- > :first-child,
- > :nth-child(2) {
- grid-column-start: 1;
- grid-column-end: 2;
- }
+ grid-template-columns: 1fr;
+ grid-column-gap: 16px;
+ grid-row-gap: 16px;
+ grid-column-gap: 0;
+ > :first-child,
+ > :nth-child(2) {
+ grid-column-start: 1;
+ grid-column-end: 2;
+ }
`}
`
@@ -115,12 +117,15 @@ export const FlexWrap = styled.div`
align-items: center;
flex-direction: row;
justify-content: center;
+
> div {
width: auto;
}
+
button {
max-width: 180px;
}
+
${({ theme }) => theme.mediaWidth.upToSmall`
flex-wrap: wrap;
> div {
@@ -134,8 +139,8 @@ export const FlexWrap = styled.div`
export const StyledContainer = styled.div`
display: flex;
- flex:1;
- align-items:center;
+ flex: 1;
+ align-items: center;
justify-content: space-between;
}
@@ -151,13 +156,16 @@ export const FlexCol = styled.div`
align-items: center;
flex-direction: column;
justify-content: center;
+
strong {
font-size: 21px;
margin-top: 6px;
+
${({ theme }) => theme.mediaWidth.upToSmall`
- font-size: 14px;
- `}
+ font-size: 14px;
+ `}
}
+
span:not([role='img']) {
font-size: 14px;
color: ${({ theme }) => theme.text6};
@@ -282,7 +290,8 @@ export const Card = styled.div`
export const BannerCard = styled(BannerExplainer)`
min-height: 192px;
border-radius: 16px;
- border: 0;
+ background: ${({ theme }) => transparentize(0.3, theme.bg1)};
+ border: 1px solid ${({ theme }) => theme.cardBorder};
padding: 0 100px 0 24px;
flex: 1;
overflow: hidden;
@@ -293,7 +302,7 @@ export const BannerCard = styled(BannerExplainer)`
`}
&:hover {
- border: 0;
+ border: 1px solid ${({ theme }) => theme.cardBorder};
}
> span {
@@ -301,6 +310,7 @@ export const BannerCard = styled(BannerExplainer)`
justify-content: space-between;
height: 100%;
padding: 24px 0;
+ color: ${({ theme }) => theme.text1};
${({ theme }) => theme.mediaWidth.upToSmall`
padding: 0;
@@ -308,6 +318,15 @@ export const BannerCard = styled(BannerExplainer)`
> b {
font-size: 24px;
+ @supports (-webkit-background-clip: text) {
+ background: ${({ theme }) => `linear-gradient(80deg, ${theme.primary1}, ${theme.primary1}, #5ea2fb)`};
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+
+ @supports not (-webkit-background-clip: text) {
+ color: ${({ theme }) => theme.text1};
+ }
${({ theme }) => theme.mediaWidth.upToSmall`
text-align: center;
@@ -316,6 +335,7 @@ export const BannerCard = styled(BannerExplainer)`
}
> small {
+ color: ${({ theme }) => theme.text1};
font-size: 14px;
line-height: 1.5;
text-align: left;
@@ -345,7 +365,7 @@ export const BannerCard = styled(BannerExplainer)`
> span > a,
> span > a:link {
font-size: 15px;
- color: ${({ theme }) => theme.white};
+ color: ${({ theme }) => theme.text1};
&:hover {
color: ${({ theme }) => theme.primary1};
@@ -360,6 +380,20 @@ export const BannerCard = styled(BannerExplainer)`
opacity: 0.25;
mix-blend-mode: initial;
}
+
+ > svg {
+ .stop1 {
+ stop-color: ${({ theme }) => theme.text1};
+ }
+ .stop2 {
+ stop-color: ${({ theme }) => theme.text1};
+ stop-opacity: 0.8;
+ }
+ .stop3 {
+ stop-color: ${({ theme }) => theme.text1};
+ stop-opacity: 0;
+ }
+ }
`
export const BalanceDisplay = styled.div<{ titleSize?: number; altColor?: boolean; hAlign?: string }>`
@@ -439,8 +473,7 @@ export const ConvertWrapper = styled.div`
display: grid;
grid-template-columns: 1fr 200px;
align-items: center;
- ${({ theme }) => theme.neumorphism.boxShadow};
- background: ${({ theme }) => theme.bg7};
+ background: ${({ theme }) => theme.cardBackground};
border-radius: 16px;
padding: 16px;
width: 100%;
diff --git a/src/custom/theme/baseTheme.tsx b/src/custom/theme/baseTheme.tsx
index 46ad24d70..ee73a2fc5 100644
--- a/src/custom/theme/baseTheme.tsx
+++ b/src/custom/theme/baseTheme.tsx
@@ -80,6 +80,7 @@ export function colors(darkMode: boolean): Colors {
// ****** other ******
border: darkMode ? '#021E34' : '#000000',
border2: darkMode ? '#254F83' : '#afcbda',
+ cardBackground: darkMode ? '#142642' : 'rgb(255 255 255 / 85%)',
cardBorder: darkMode ? '#021E34' : 'rgba(255, 255, 255, 0.5)',
cardShadow1: darkMode ? '#4C7487' : '#FFFFFF',
cardShadow2: darkMode ? 'rgba(1, 10, 16, 0.15)' : 'rgba(11, 37, 53, 0.93)',
diff --git a/src/custom/theme/styled.d.ts b/src/custom/theme/styled.d.ts
index 0f3eed2d4..aaa1ffd5c 100644
--- a/src/custom/theme/styled.d.ts
+++ b/src/custom/theme/styled.d.ts
@@ -32,6 +32,7 @@ export interface Colors extends ColorsUniswap {
infoText: Color
warningText: Color
errorText: Color
+ cardBackground: Color
cardBorder: Color
cardShadow1: Color
cardShadow2: Color
From 8b2ab3a56b172d2570cf625839eb3797f02ca64a Mon Sep 17 00:00:00 2001
From: Lint Action
Date: Tue, 22 Mar 2022 19:01:18 +0000
Subject: [PATCH 3/4] Fix code style issues with Prettier
---
src/custom/pages/Profile/styled.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/custom/pages/Profile/styled.tsx b/src/custom/pages/Profile/styled.tsx
index 5f19236e8..8f95d7bf1 100644
--- a/src/custom/pages/Profile/styled.tsx
+++ b/src/custom/pages/Profile/styled.tsx
@@ -318,7 +318,7 @@ export const BannerCard = styled(BannerExplainer)`
> b {
font-size: 24px;
-
+
@supports (-webkit-background-clip: text) {
background: ${({ theme }) => `linear-gradient(80deg, ${theme.primary1}, ${theme.primary1}, #5ea2fb)`};
-webkit-background-clip: text;
From afc15221f5dee6de4155971a469fd2dc2b9f9d13 Mon Sep 17 00:00:00 2001
From: biocom
Date: Wed, 23 Mar 2022 07:51:26 +0000
Subject: [PATCH 4/4] Style update (trigger build)
---
src/custom/pages/Profile/styled.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/custom/pages/Profile/styled.tsx b/src/custom/pages/Profile/styled.tsx
index 8f95d7bf1..88f494d63 100644
--- a/src/custom/pages/Profile/styled.tsx
+++ b/src/custom/pages/Profile/styled.tsx
@@ -510,8 +510,8 @@ export const VestingBreakdown = styled.div`
}
> span > p {
- margin: 0;
font-weight: 500;
+ margin: 0;
}
> span:last-of-type > p {