From 533368aa81b6fbd69bc3155f0941525f705a230e Mon Sep 17 00:00:00 2001 From: Make Better Consulting <84382214+MakeBetterConsulting@users.noreply.github.com> Date: Fri, 6 Aug 2021 15:20:33 +0200 Subject: [PATCH 1/2] styling --- .../ffAssetOverview.module.css | 2 +- components/ffAssets/ffAssets.module.css | 20 ++- components/ffAssets/ffAssetsTable.js | 4 +- components/ffClaim/ffClaim.js | 1 + components/ffClaim/ffClaim.module.css | 10 +- .../ffCurveLiquidity/ffCurveLiquidity.js | 2 + .../ffCurveLiquidity.module.css | 17 +- components/ffGauges/ffGauges.js | 2 +- components/ffGauges/ffGauges.module.css | 14 +- components/ffLPOptions/ffLPOptions.js | 77 +++++---- components/ffLPOptions/ffLPOptions.module.css | 56 ++++++- components/ffMintBurn/ffMintBurn.js | 150 ++++++++++-------- components/ffMintBurn/ffMintBurn.module.css | 75 +++++++-- components/ffOverview/ffOverview.js | 64 ++++---- components/ffOverview/ffOverview.module.css | 4 +- components/ffStake/ffStake.js | 3 + components/ffStake/ffStake.module.css | 29 +++- .../ffStakeDistribution.module.css | 10 +- .../ffStakeOverview.module.css | 4 +- components/ffVest/ffVest.js | 6 +- components/ffVest/ffVest.module.css | 22 ++- components/ffVest/noBalances.js | 6 +- components/ffVoteCast/ffVoteCast.module.css | 10 +- .../ffVoteOverview/ffVoteOverview.module.css | 6 +- components/ffVoteOverview/gaugeVotePie.js | 8 +- components/header/header.module.css | 1 + components/navigation/navigation.js | 77 +++++++-- components/navigation/navigation.module.css | 6 +- pages/asset/[address]/asset.module.css | 9 +- pages/asset/[address]/curve/curve.module.css | 4 +- pages/home/home.module.css | 4 +- pages/stake/stake.module.css | 5 +- pages/vest/index.js | 2 +- pages/vest/vest.module.css | 5 +- pages/vote/vote.module.css | 5 +- public/favicon.png | Bin 2046 -> 2083 bytes public/logo-dark.svg | 21 +++ public/logo-light.svg | 21 +++ stores/fixedForexStore.js | 2 +- theme/dark.js | 4 +- theme/light.js | 4 +- 41 files changed, 536 insertions(+), 236 deletions(-) create mode 100644 public/logo-dark.svg create mode 100644 public/logo-light.svg diff --git a/components/ffAssetOverview/ffAssetOverview.module.css b/components/ffAssetOverview/ffAssetOverview.module.css index 3522ebb..d291b90 100644 --- a/components/ffAssetOverview/ffAssetOverview.module.css +++ b/components/ffAssetOverview/ffAssetOverview.module.css @@ -43,7 +43,7 @@ .balanceIcon { color: #fff; - border: 1px solid #fff; + border: 1px solid rgba(255,255,255,0.2); border-radius: 50%; padding: 12px; font-size: 60px !important; diff --git a/components/ffAssets/ffAssets.module.css b/components/ffAssets/ffAssets.module.css index 5fb778b..531373e 100644 --- a/components/ffAssets/ffAssets.module.css +++ b/components/ffAssets/ffAssets.module.css @@ -10,13 +10,13 @@ width: calc(100% - 48px); max-width: 1356px; display: flex; - border: 1px solid rgba(128, 128, 128, 0.8); + border: 1px solid rgba(104, 108, 122, 0.25); position: absolute; - top: 240px; + top: 252px; left: 24px; right: 24px; margin: auto; - padding: 24px 0px; + padding: 0 0 20px 0px; } .title { @@ -25,6 +25,18 @@ } .tableContainer { - border: 1px solid rgba(128, 128, 128, 0.8); + border: 1px solid rgba(104, 108, 122, 0.25); margin: 0 auto; } + +@media screen and (max-width: 1200px) { + .container { + margin-top: -60px; + } +} + +@media screen and (max-width: 960px) { + .container { + margin-top: 117px; + } +} diff --git a/components/ffAssets/ffAssetsTable.js b/components/ffAssets/ffAssetsTable.js index 116da0f..705c16b 100644 --- a/components/ffAssets/ffAssetsTable.js +++ b/components/ffAssets/ffAssetsTable.js @@ -144,7 +144,7 @@ const useStyles = makeStyles((theme) => ({ padding: '24px', width: '100%', flexWrap: 'wrap', - borderBottom: '1px solid rgba(128, 128, 128, 0.32)', + borderBottom: '1px solid rgba(104, 108, 122, 0.25)', background: 'radial-gradient(circle, rgba(63,94,251,0.7) 0%, rgba(47,128,237,0.7) 48%) rgba(63,94,251,0.7) 100%', }, assetInfoError: { @@ -155,7 +155,7 @@ const useStyles = makeStyles((theme) => ({ padding: '24px', width: '100%', flexWrap: 'wrap', - borderBottom: '1px solid rgba(128, 128, 128, 0.32)', + borderBottom: '1px rgba(104, 108, 122, 0.25)', background: '#dc3545', }, infoField: { diff --git a/components/ffClaim/ffClaim.js b/components/ffClaim/ffClaim.js index 1849fba..6a50369 100644 --- a/components/ffClaim/ffClaim.js +++ b/components/ffClaim/ffClaim.js @@ -37,6 +37,7 @@ export default function ffClaim() { setLoading(true) stores.dispatcher.dispatch({ type: FIXED_FOREX_CLAIM_VESTING_REWARD, content: {}}) // } + } return ( diff --git a/components/ffClaim/ffClaim.module.css b/components/ffClaim/ffClaim.module.css index e784ce2..7b9131a 100644 --- a/components/ffClaim/ffClaim.module.css +++ b/components/ffClaim/ffClaim.module.css @@ -11,7 +11,7 @@ } .lpOptionsContainer { - border: 1px solid rgba(128, 128, 128, 0.8); + border: 1px solid rgba(104, 108, 122, 0.25); margin: 0 auto; display: flex; align-items: center; @@ -63,8 +63,6 @@ top: 12px; } - - .lpOption:nth-child(1):hover > div { color: #fff !important; } @@ -73,3 +71,9 @@ font-size: 60px !important; font-weight: bold !important; } + +@media screen and (max-width: 1200px) { + .container { + margin-bottom: 48px; + } +} diff --git a/components/ffCurveLiquidity/ffCurveLiquidity.js b/components/ffCurveLiquidity/ffCurveLiquidity.js index e0d718b..3d3344d 100644 --- a/components/ffCurveLiquidity/ffCurveLiquidity.js +++ b/components/ffCurveLiquidity/ffCurveLiquidity.js @@ -447,6 +447,7 @@ export default function ffCurveLiquidity({ asset }) { - - -
-
- { - activeTab === 'deposit' && - <> - { renderInput('deposit', 'Deposit', onAmountChanged, onAmountPercentChanged, depositAmount, onAssetChanged, depositAsset) } - { renderInput('mint', 'Mint', onAmountChanged, onAmountPercentChanged, mintAmount, onAssetChanged, mintAsset) } - - } - { - activeTab === 'withdraw' && - <> - { renderInput('withdraw', 'Withdraw', onAmountChanged, onAmountPercentChanged, withdrawAmount, onAssetChanged, withdrawAsset) } - { renderInput('burn', 'Burn', onAmountChanged, onAmountPercentChanged, burnAmount, onAssetChanged, burnAsset) } - - } + + +
+ + + + + + + +
- { - activeTab === 'deposit' && -
- - -
- } - { - activeTab === 'withdraw' && -
- - -
- } -
+ + +
+ + +
+ { + activeTab === 'deposit' && + <> + { renderInput('deposit', 'Deposit', onAmountChanged, onAmountPercentChanged, depositAmount, onAssetChanged, depositAsset) } + { renderInput('mint', 'Mint', onAmountChanged, onAmountPercentChanged, mintAmount, onAssetChanged, mintAsset) } + + } + { + activeTab === 'withdraw' && + <> + { renderInput('withdraw', 'Withdraw', onAmountChanged, onAmountPercentChanged, withdrawAmount, onAssetChanged, withdrawAsset) } + { renderInput('burn', 'Burn', onAmountChanged, onAmountPercentChanged, burnAmount, onAssetChanged, burnAsset) } + + } +
+ + + { + activeTab === 'deposit' && +
+ + +
+ } + { + activeTab === 'withdraw' && +
+ + +
+ } + + +
+ + ); } diff --git a/components/ffMintBurn/ffMintBurn.module.css b/components/ffMintBurn/ffMintBurn.module.css index 44f8635..d60ac38 100644 --- a/components/ffMintBurn/ffMintBurn.module.css +++ b/components/ffMintBurn/ffMintBurn.module.css @@ -2,7 +2,7 @@ width: calc(100% - 48px); max-width: 1356px; display: flex; - border: 1px solid rgba(128, 128, 128, 0.8); + border: 1px solid rgba(104, 108, 122, 0.25); position: absolute; top: 240px; left: 24px; @@ -11,18 +11,21 @@ border-radius: 30px; } +.buttonWrap { +} + .actionsContainer { display: grid; grid-gap: 12px; grid-template-columns: 1fr; - border-left: 1px solid rgba(128, 128, 128, 0.8); + border-left: 1px solid rgba(104, 108, 122, 0.25); padding: 0px 24px; - width: 240px; + width: 100%; } .informationContainer { width: 300px; - border-left: 1px solid rgba(128, 128, 128, 0.25); + border-left: 1px solid rgba(104, 108, 122, 0.25); min-height: 140px; padding: 0px 12px; } @@ -58,16 +61,17 @@ .toggleButtons { display: flex; flex-direction: column; - min-height: 140px; - width: 200px; + min-height: 170px; + width: 100%; } .button { border-radius: 0px !important; flex: 1; - border-right: 1px solid rgba(128, 128, 128, 0.25) !important; + border-right: 1px solid rgba(104, 108, 122, 0.25) !important; transition: none !important; - opacity: 0.5; + opacity: 1; + color: rgba(104, 108, 122, 0.5) !important; } .buttonActive { @@ -101,17 +105,21 @@ .topLeftButton { border-top-left-radius: 10px !important; - border-bottom: 1px solid rgba(128, 128, 128, 0.25) !important; + border-bottom: 1px solid rgba(104, 108, 122, 0.25) !important; + width: 100%; + min-height: 85px; } .bottomLeftButton { border-bottom-left-radius: 10px !important; + width: 100%; + min-height: 85px; } .inputsContainer { display: grid; grid-template-columns: 1fr 1fr; - grid-gap: 24px 48px; + grid-gap: 24px 0px; padding: 0px 24px; flex: 1; } @@ -126,6 +134,51 @@ display: flex; } -@media screen and (max-width: 576px) { +.buttonOverride { + background: #114DF0 !important; + color: #FFF !important; + font-weight: 700 !important; + box-shadow: none !important; + width: 100% !important; +} + +@media screen and (max-width: 1200px) { + .container { + margin-top: -60px; + } + + .buttonWrap { + margin-top: 20px !important; + } + + .actionsContainer { + border-left: 0px solid rgba(104, 108, 122, 0.25); + } + + +} + +@media screen and (max-width: 960px) { + .container { + margin-top: -60px; + } + + .toggleButtons { + display: flex; + flex-direction: column; + min-height: 85px; + width: 100%; + } + + .topLeftButton { + border-top-left-radius: 10px !important; + border-right: 1px solid rgba(104, 108, 122, 0.25) !important; + border-bottom: 1px solid rgba(104, 108, 122, 0.25) !important; + } + .bottomLeftButton { + border-top-right-radius: 10px !important; + border-bottom-left-radius: 0px !important; + border-bottom: 1px solid rgba(104, 108, 122, 0.25) !important; + } } diff --git a/components/ffOverview/ffOverview.js b/components/ffOverview/ffOverview.js index 3c93ff7..7cb1e3d 100644 --- a/components/ffOverview/ffOverview.js +++ b/components/ffOverview/ffOverview.js @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { Paper, Typography, Button, TextField, InputAdornment, CircularProgress } from '@material-ui/core'; +import { Paper, Grid, Typography, Button, TextField, InputAdornment, CircularProgress } from '@material-ui/core'; import Autocomplete from '@material-ui/lab/Autocomplete'; import Skeleton from '@material-ui/lab/Skeleton'; import AccountBalanceWalletIcon from '@material-ui/icons/AccountBalanceWallet'; @@ -38,36 +38,44 @@ export default function ffOverview() { return (
-
- -
- IBFF Balance: -
- { formatCurrency(ibff ? ibff.balance : 0) } - { ibff ? ibff.symbol : '' } + + +
+ +
+ IBFF Balance: +
+ { formatCurrency(ibff ? ibff.balance : 0) } + { ibff ? ibff.symbol : '' } +
+
-
-
-
- -
- Vested Balance: -
- { formatCurrency((veIBFF && veIBFF.vestingInfo) ? veIBFF.vestingInfo.lockValue : 0) } - { veIBFF ? veIBFF.symbol : '' } + + +
+ +
+ Vested Balance: +
+ { formatCurrency((veIBFF && veIBFF.vestingInfo) ? veIBFF.vestingInfo.lockValue : 0) } + { veIBFF ? veIBFF.symbol : '' } +
+
-
-
-
- -
- Rewards Available: -
- { formatCurrency(rewards ? rewards.faucet.faucet : 0) } - { ibff ? ibff.symbol : '' } + + +
+ +
+ Rewards Available: +
+ { formatCurrency(rewards ? rewards.faucet.faucet : 0) } + { ibff ? ibff.symbol : '' } +
+
-
-
+ +
); diff --git a/components/ffOverview/ffOverview.module.css b/components/ffOverview/ffOverview.module.css index 19edf57..98b6831 100644 --- a/components/ffOverview/ffOverview.module.css +++ b/components/ffOverview/ffOverview.module.css @@ -20,7 +20,7 @@ } .title { - background: rgba(256, 256, 256, 0.3); + background: rgba(256, 256, 256, 0.2); border-radius: 30px; padding: 4px 20px; width: fit-content; @@ -49,7 +49,7 @@ .balanceIcon { color: #fff; - border: 1px solid #fff; + border: 1px solid rgba(255,255,255,0.2); border-radius: 50%; padding: 16px; font-size: 70px !important; diff --git a/components/ffStake/ffStake.js b/components/ffStake/ffStake.js index b266db8..f20d7b1 100644 --- a/components/ffStake/ffStake.js +++ b/components/ffStake/ffStake.js @@ -261,6 +261,7 @@ export default function ffStake() { variant='contained' size='large' color='primary' + className={classes.buttonOverride} disabled={ depositApprovalNotRequired || approvalLoading } onClick={ onApprove } > @@ -271,6 +272,7 @@ export default function ffStake() { variant='contained' size='large' color='primary' + className={classes.buttonOverride} disabled={ stakeLoading } onClick={ onStake } > @@ -285,6 +287,7 @@ export default function ffStake() {
- + +
+ router.push('/')} className={classes.linkz}> + + + + + + + + + + + + + + + + + + + + + + +
+
{renderNavs()}
diff --git a/components/navigation/navigation.module.css b/components/navigation/navigation.module.css index 05c08ee..99837a3 100644 --- a/components/navigation/navigation.module.css +++ b/components/navigation/navigation.module.css @@ -247,8 +247,10 @@ a.linkz { cursor: pointer !important; } } .yearnLogo { - width: 95px !important; - height: 42.3px !important; + width: 110px !important; + height: 50px !important; + left: -3px; + position: relative; } .iconHack { diff --git a/pages/asset/[address]/asset.module.css b/pages/asset/[address]/asset.module.css index 2246866..a065223 100644 --- a/pages/asset/[address]/asset.module.css +++ b/pages/asset/[address]/asset.module.css @@ -6,7 +6,6 @@ margin-top: 0px; padding-top: 60px; position: relative; - position: relative; } @@ -15,9 +14,7 @@ } @media screen and (max-width: 1200px) { - -} - -@media screen and (max-width: 1000px) { - + .container { + padding-top: 0px; + } } diff --git a/pages/asset/[address]/curve/curve.module.css b/pages/asset/[address]/curve/curve.module.css index 2246866..e053c1b 100644 --- a/pages/asset/[address]/curve/curve.module.css +++ b/pages/asset/[address]/curve/curve.module.css @@ -15,7 +15,9 @@ } @media screen and (max-width: 1200px) { - + .container { + padding-top: 0px; + } } @media screen and (max-width: 1000px) { diff --git a/pages/home/home.module.css b/pages/home/home.module.css index 7c0684d..603be78 100644 --- a/pages/home/home.module.css +++ b/pages/home/home.module.css @@ -14,7 +14,9 @@ } @media screen and (max-width: 1200px) { - + .ffContainer { + padding-top: 0px; + } } @media screen and (max-width: 1000px) { diff --git a/pages/stake/stake.module.css b/pages/stake/stake.module.css index 7c0684d..8108427 100644 --- a/pages/stake/stake.module.css +++ b/pages/stake/stake.module.css @@ -6,7 +6,6 @@ margin-top: 0px; padding-top: 60px; position: relative; - position: relative; } @media screen and (max-width: 1600px) { @@ -14,7 +13,9 @@ } @media screen and (max-width: 1200px) { - + .ffContainer { + padding-top: 0px; + } } @media screen and (max-width: 1000px) { diff --git a/pages/vest/index.js b/pages/vest/index.js index aa000a9..3230608 100644 --- a/pages/vest/index.js +++ b/pages/vest/index.js @@ -6,7 +6,7 @@ import Layout from '../../components/layout/layout.js'; import Vesting from '../../components/ffVest'; import Overview from '../../components/ffOverview'; import Claim from '../../components/ffClaim'; -import ClaimDistribution from '../../components/ffClaimDistirbution'; +import ClaimDistribution from '../../components/ffClaimDistirbution'; import classes from './vest.module.css'; diff --git a/pages/vest/vest.module.css b/pages/vest/vest.module.css index 7c0684d..8108427 100644 --- a/pages/vest/vest.module.css +++ b/pages/vest/vest.module.css @@ -6,7 +6,6 @@ margin-top: 0px; padding-top: 60px; position: relative; - position: relative; } @media screen and (max-width: 1600px) { @@ -14,7 +13,9 @@ } @media screen and (max-width: 1200px) { - + .ffContainer { + padding-top: 0px; + } } @media screen and (max-width: 1000px) { diff --git a/pages/vote/vote.module.css b/pages/vote/vote.module.css index 7c0684d..8108427 100644 --- a/pages/vote/vote.module.css +++ b/pages/vote/vote.module.css @@ -6,7 +6,6 @@ margin-top: 0px; padding-top: 60px; position: relative; - position: relative; } @media screen and (max-width: 1600px) { @@ -14,7 +13,9 @@ } @media screen and (max-width: 1200px) { - + .ffContainer { + padding-top: 0px; + } } @media screen and (max-width: 1000px) { diff --git a/public/favicon.png b/public/favicon.png index e6df72703d935cb45a121ce08ccefb8fc886923b..c5b86368a61960bd0b8d8f113e20aefbecacc844 100644 GIT binary patch delta 1387 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 diff --git a/public/logo-dark.svg b/public/logo-dark.svg new file mode 100644 index 0000000..d0a4e90 --- /dev/null +++ b/public/logo-dark.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/public/logo-light.svg b/public/logo-light.svg new file mode 100644 index 0000000..4bea83a --- /dev/null +++ b/public/logo-light.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/stores/fixedForexStore.js b/stores/fixedForexStore.js index 4f7f926..0d2b3c0 100644 --- a/stores/fixedForexStore.js +++ b/stores/fixedForexStore.js @@ -652,7 +652,7 @@ class Store { return this.emitter.emit(FIXED_FOREX_STAKING_REWARD_CLAIMED, res); }); } - + _callClaimCurveReward = async (web3, account, asset, gasSpeed, callback) => { try { const gaugeContract = new web3.eth.Contract(abis.gaugeABI, asset.gauge.address) diff --git a/theme/dark.js b/theme/dark.js index 22813dc..9be4705 100644 --- a/theme/dark.js +++ b/theme/dark.js @@ -36,10 +36,10 @@ const theme = createTheme({ }, MuiTooltip: { tooltip: { - background: "#000 !important", + background: "#FFF !important", border: "1px solid #fff", borderRadius: "8px", - color: "#fff", + color: "#000", fontSize: "13px" } } diff --git a/theme/light.js b/theme/light.js index e159017..b4f8997 100644 --- a/theme/light.js +++ b/theme/light.js @@ -39,10 +39,10 @@ const theme = createTheme({ }, MuiTooltip: { tooltip: { - background: "#fff !important", + background: "#000 !important", border: "1px solid #000", borderRadius: "8px", - color: "#000", + color: "#FFF", fontSize: "13px" } } From 3577980e5a10229b4afd3811b3c228fa7d877356 Mon Sep 17 00:00:00 2001 From: x33q <40147432+x33q@users.noreply.github.com> Date: Fri, 6 Aug 2021 15:22:36 +0200 Subject: [PATCH 2/2] Styling & Mobile breakpoints refinement (#1) Temp logo added Fixed mobile navigation Yearn logo error Hid header on mobile breakpoints Mobile breakpoints is not completed overall, but an improvement.