diff --git a/packages/boba/gateway/src/components/icons/BobaLogo.js b/packages/boba/gateway/src/components/icons/BobaLogo.js index be9b73a830..77eab2cb6c 100644 --- a/packages/boba/gateway/src/components/icons/BobaLogo.js +++ b/packages/boba/gateway/src/components/icons/BobaLogo.js @@ -1,11 +1,9 @@ import * as React from "react" import { useTheme } from '@mui/material'; +import { ReactComponent as LogoBoba2 } from 'images/boba2/logo-boba2.svg'; +import {ReactComponent as LogoBoba2dark} from 'images/boba2/logo-boba2-dark.svg'; -import {ReactComponent as LogoBoba2} from '../../images/boba2/logo-boba2.svg'; -import {ReactComponent as LogoBoba2dark} from '../../images/boba2/logo-boba2-dark.svg'; - - -function BobaLogo({ dark = false, selected = true }) { +function BobaLogo() { const theme = useTheme(); diff --git a/packages/boba/gateway/src/components/select/Select.js b/packages/boba/gateway/src/components/select/Select.js index b67ab16e43..0d2c5852bb 100644 --- a/packages/boba/gateway/src/components/select/Select.js +++ b/packages/boba/gateway/src/components/select/Select.js @@ -14,9 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. */ import React from 'react'; -import {Select as MuiSelect, MenuItem, useTheme, Typography, Box} from '@mui/material'; +import ReactSelect from 'react-select'; +import { Select as MuiSelect, MenuItem, useTheme, Typography, Box } from '@mui/material'; import * as styles from './Select.module.scss'; import * as S from './Select.style'; +import { ArrowDropDownOutlined } from '@mui/icons-material'; import { Option, MultiValue, @@ -24,17 +26,17 @@ import { } from './Custom.select'; function Select({ - label, - value, - options, - onSelect, - loading, - error = '', - className, - newSelect = false, - isMulti, - isLoading = false, - }) { + label, + value, + options, + onSelect, + loading, + error = '', + className, + newSelect = false, + isMulti, + isLoading = false, +}) { const theme = useTheme(); const selected = options.find(i => i.value === value); @@ -61,16 +63,15 @@ function Select({ } const renderLoading = ( - + Loading... ); - console.log("VALUE", value); - const renderSelect = ( <> } className={styles.select} value={value} onChange={onSelect} @@ -80,8 +81,7 @@ function Select({ '&& .Mui-selected': { backgroundColor: 'transparent !important', color: theme.palette.secondary.main, - }, - } + },} }} > {options.map((i, index) => ( @@ -94,7 +94,7 @@ function Select({ {i.title} - + {i.description} @@ -108,10 +108,9 @@ function Select({ {selected ? selected.subTitle : ''} - + fillOpacity="0.45" /> > @@ -124,17 +123,53 @@ function Select({ className ].join(' ')}> {label && {label}} - { - onSelect({ - value: e.target.value, - label: e.target.value, + ({ + ...base, + background: theme.palette.background.default, + borderRadius: theme.palette.primary.borderRadius, + padding: '5px 10px', + width: '100%', + border: '1px solid rgba(255, 255, 255, 0.14)' + }), + indicatorSeparator: (base) => ({ + ...base, + display: 'none', + }), + container: (base) => ({ + ...base, + background: 'none' + }), + singleValue: (base) => ({ + ...base, + background: 'transparent', + color: theme.palette.secondary.text, + padding: '5px' + }), + multiValue: (base) => ({ + ...base, + background: theme.palette.background.secondary, + color: theme.palette.secondary.text, + marginRight: '5px', + paddingRight: '5px', + }), + valueContainer: (base) => ({ + ...base, + background: 'none', }) }} - value={value.value} - options={options.map(i => ({value: i.value, title: i.label}))} - isLoading={isLoading} - multiple={isMulti} + theme={theme} + components={{ + Option, + MultiValue, + SingleValue + }} /> } diff --git a/packages/boba/gateway/src/containers/VoteAndDao/Dao/Dao.js b/packages/boba/gateway/src/containers/VoteAndDao/Dao/Dao.js index 33b52ce663..d7c31114e0 100644 --- a/packages/boba/gateway/src/containers/VoteAndDao/Dao/Dao.js +++ b/packages/boba/gateway/src/containers/VoteAndDao/Dao/Dao.js @@ -142,7 +142,6 @@ function DAO() { }} sx={{ marginBottom: '20px' }} value={selectedState} - newSelect={true} > diff --git a/packages/boba/gateway/src/containers/bridge/Bridge.js b/packages/boba/gateway/src/containers/bridge/Bridge.js index 9ce4207aa2..5040da59af 100644 --- a/packages/boba/gateway/src/containers/bridge/Bridge.js +++ b/packages/boba/gateway/src/containers/bridge/Bridge.js @@ -1,4 +1,4 @@ -import { Typography, useMediaQuery, useTheme } from '@mui/material' +import { useMediaQuery, useTheme } from '@mui/material' import React from 'react' import { useSelector } from 'react-redux' import { selectActiveNetwork } from 'selectors/networkSelector' @@ -21,23 +21,24 @@ function BridgeContainer() { isMobile && accountEnabled ? null : - Transfer + + + Transfer tokens between {activeNetwork} and - Boba network! - - + + } diff --git a/packages/boba/gateway/src/containers/bridge/Bridge.styles.js b/packages/boba/gateway/src/containers/bridge/Bridge.styles.js index 6d7a169398..ba14224a12 100644 --- a/packages/boba/gateway/src/containers/bridge/Bridge.styles.js +++ b/packages/boba/gateway/src/containers/bridge/Bridge.styles.js @@ -1,9 +1,10 @@ import styled from '@emotion/styled' -import { Box } from "@mui/material" +import {Box, Typography} from "@mui/material" import bobaGlassIcon from 'images/boba2/boba_glass.svg' import bobaBridgeBg from 'images/boba2/bridge_bg.svg' export const PageContainer = styled(Box)(({ theme }) => ({ margin: '20px auto', + marginBottom: theme.palette.spacing.toFooter, display: 'flex', flexDirection: 'column', justifyContent: 'space-around', @@ -24,14 +25,16 @@ export const PageContainer = styled(Box)(({ theme }) => ({ '::after': { content: '" "', position: 'absolute', - left: '-5%', - bottom: '10%', - width: '130%', + width: '100%', height: '100%', background: `url(${bobaBridgeBg}) no-repeat`, - backgroundSize: '85%', + backgroundSize: '100%', + backgroundPosition: 'center', + left: '0', + bottom: '0', zIndex: '-1', - } + }, + })); @@ -39,7 +42,7 @@ export const ContentWrapper = styled(Box)(({ theme }) => ({ display: 'flex', justifyContent: 'space-between', width: '100%', - alignItems: 'flex-start', + alignItems: 'flex-center', gap: '20px', [ theme.breakpoints.down('sm') ]: { flexDirection: 'column', @@ -49,14 +52,14 @@ export const ContentWrapper = styled(Box)(({ theme }) => ({ })) export const TitleContainer = styled(Box)(({ theme }) => ({ - width: '40%', + width: '50%', textTransform: 'uppercase', display: 'flex', justifyContent: 'center', - alignItems: 'flex-start', + alignItems: 'center', padding: '70px 50px', position: 'relative', - minHeight: '500px', + minHeight: 'auto', [ theme.breakpoints.down('sm') ]: { padding: '0', width: '100%', @@ -68,18 +71,45 @@ export const TitleContainer = styled(Box)(({ theme }) => ({ display: 'none' } }, - '::before': { - content: '" "', - position: 'absolute', - top: '5%', - right: '25%', - width: '80px', - height: '80px', - background: `url(${bobaGlassIcon}) no-repeat`, - backgroundSize: '100% 90%', + // '::before': { + // content: '" "', + // position: 'absolute', + // top: '20%', + // right: '30%', + // width: '80px', + // height: '80px', + // background: `url(${bobaGlassIcon}) no-repeat`, + // backgroundSize: '100% 90%', + // }, +})) + +export const BobaGlassIcon = styled(Box)(({ theme }) => ({ + content: '" "', + position: 'absolute', + top: '15%', + right: '35%', + width: '80px', + height: '80px', + background: `url(${bobaGlassIcon}) no-repeat`, + backgroundSize: '100% 90%', + [theme.breakpoints.down(1700)]: { + top: '20%', + right: '40%', + width: '70px', + height: '70px', + }, + [theme.breakpoints.down(1400)]: { + top: '20%', + right: '20%', + width: '70px', + height: '70px', + }, + [theme.breakpoints.down(900)]: { + display: 'none', }, })) + export const Content = styled(Box)(({ theme }) => ({ display: 'flex', flexDirection: 'column', @@ -94,3 +124,13 @@ export const Content = styled(Box)(({ theme }) => ({ width: '100%' } })) + +export const BridgeTypography = styled(Typography)(({ theme }) => ({ + fontSize: '57px !important', + [theme.breakpoints.down(1700)]: { + fontSize: '40px !important', + }, + [theme.breakpoints.down(1000)]: { + fontSize: '30px !important', + }, +})) diff --git a/packages/boba/gateway/src/containers/dao/OldDao.styles.js b/packages/boba/gateway/src/containers/dao/OldDao.styles.js index d70538bca5..70c789d0bf 100644 --- a/packages/boba/gateway/src/containers/dao/OldDao.styles.js +++ b/packages/boba/gateway/src/containers/dao/OldDao.styles.js @@ -3,6 +3,7 @@ import { Box } from "@mui/material" export const DaoPageContainer = styled(Box)(({ theme }) => ({ margin: '0px auto', + marginBottom: theme.palette.spacing.toFooter, display: 'flex', flexDirection: 'column', justifyContent: 'space-around', diff --git a/packages/boba/gateway/src/containers/earn/Earn.styles.js b/packages/boba/gateway/src/containers/earn/Earn.styles.js index 11e257d422..05feb56856 100644 --- a/packages/boba/gateway/src/containers/earn/Earn.styles.js +++ b/packages/boba/gateway/src/containers/earn/Earn.styles.js @@ -3,6 +3,7 @@ import { Box, Typography, Grid } from "@mui/material" export const EarnPageContainer = styled(Box)(({ theme }) => ({ margin: '0px auto', + marginBottom: theme.palette.spacing.toFooter, display: 'flex', flexDirection: 'column', justifyContent: 'space-around', diff --git a/packages/boba/gateway/src/containers/ecosystem/Ecosystem.styles.js b/packages/boba/gateway/src/containers/ecosystem/Ecosystem.styles.js index 1f5c62300c..9be0d9caa2 100644 --- a/packages/boba/gateway/src/containers/ecosystem/Ecosystem.styles.js +++ b/packages/boba/gateway/src/containers/ecosystem/Ecosystem.styles.js @@ -3,6 +3,7 @@ import { styled } from '@mui/material/styles' export const EcoSystemPageContainer = styled(Box)(({ theme }) => ({ margin: '0px auto', + marginBottom: theme.palette.spacing.toFooter, display: 'flex', flexDirection: 'column', justifyContent: 'space-around', @@ -68,10 +69,10 @@ export const ProjectContent = styled(Box)(({ theme }) => ({ alignItems: 'center', padding: '16px', paddingTop: '50px', - gap: 1, + gap: '16px', marginTop: '50px', width: '100%', - height: '140px', + height: '165px', [theme.breakpoints.down('md')]: { minHeight: '140px', height: 'auto', @@ -113,11 +114,13 @@ export const ProjectDescription = styled(Typography)(({ theme }) => ({ overflow: 'hidden', textOverflow: 'ellipsis', opacity: 0.85, - fontSize: '0.7em', + fontSize: '13px', fontWeight: 400, display: '-webkit-box', WebkitLineClamp: 3, WebkitBoxOrient: 'vertical', + lineHeight: '20px', + textAlign: 'center', })) export const TileFooter = styled(Box)(({ theme, ...props }) => ({ diff --git a/packages/boba/gateway/src/containers/ecosystem/Projects.js b/packages/boba/gateway/src/containers/ecosystem/Projects.js index 03b2b0a6dc..24136d5911 100644 --- a/packages/boba/gateway/src/containers/ecosystem/Projects.js +++ b/packages/boba/gateway/src/containers/ecosystem/Projects.js @@ -49,7 +49,7 @@ const Projects = ({projectType}) => { - {project.title} + {project.title} {isMobile ? ({ margin: '0px auto', + marginBottom: theme.palette.spacing.toFooter, display: 'flex', flexDirection: 'column', justifyContent: 'space-around', diff --git a/packages/boba/gateway/src/containers/home/Home.js b/packages/boba/gateway/src/containers/home/Home.js index 5762738e3b..03b8035dfa 100644 --- a/packages/boba/gateway/src/containers/home/Home.js +++ b/packages/boba/gateway/src/containers/home/Home.js @@ -325,13 +325,12 @@ function Home() { } {! maintenance && - + diff --git a/packages/boba/gateway/src/containers/save/Save.styles.js b/packages/boba/gateway/src/containers/save/Save.styles.js index 0666bbd441..6dcef1ac85 100644 --- a/packages/boba/gateway/src/containers/save/Save.styles.js +++ b/packages/boba/gateway/src/containers/save/Save.styles.js @@ -4,6 +4,7 @@ import stakeBg from 'images/boba2/stake-balance-bg.png' export const StakePageContainer = styled(Box)(({ theme }) => ({ margin: '0px auto', + marginBottom: theme.palette.spacing.toFooter, display: 'flex', flexDirection: 'column', justifyContent: 'space-around', diff --git a/packages/boba/gateway/src/containers/wallet/wallet.styles.js b/packages/boba/gateway/src/containers/wallet/wallet.styles.js index 4ddda72f5d..cf12307f30 100644 --- a/packages/boba/gateway/src/containers/wallet/wallet.styles.js +++ b/packages/boba/gateway/src/containers/wallet/wallet.styles.js @@ -2,6 +2,7 @@ import styled from '@emotion/styled' import { Box } from '@mui/material' export const PageContainer = styled(Box)(({ theme }) => ({ + marginBottom: theme.palette.spacing.toFooter, margin: '0px auto', display: 'flex', flexDirection: 'column', diff --git a/packages/boba/gateway/src/images/boba2/icons/calender.svg b/packages/boba/gateway/src/images/boba2/icons/calender.svg deleted file mode 100644 index 3bb5d80b50..0000000000 --- a/packages/boba/gateway/src/images/boba2/icons/calender.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/boba/gateway/src/images/boba2/logo-boba2-dark.svg b/packages/boba/gateway/src/images/boba2/logo-boba2-dark.svg new file mode 100644 index 0000000000..20cb84035e --- /dev/null +++ b/packages/boba/gateway/src/images/boba2/logo-boba2-dark.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/boba/gateway/src/layout/index.js b/packages/boba/gateway/src/layout/index.js index 48fdab39d4..0bcbe613de 100644 --- a/packages/boba/gateway/src/layout/index.js +++ b/packages/boba/gateway/src/layout/index.js @@ -92,6 +92,9 @@ function App() { main: '#fff', contrastText: buttonColor, }, + spacing: { + toFooter: '80px', + }, }, typography: { fontFamily: ['MrEavesXL', 'Roboto'].join(','),