Skip to content

Commit

Permalink
style: address UI commentaries
Browse files Browse the repository at this point in the history
  • Loading branch information
DiogoSoaress committed Nov 13, 2023
1 parent a71f8db commit 4ba8c27
Show file tree
Hide file tree
Showing 13 changed files with 79 additions and 45 deletions.
2 changes: 1 addition & 1 deletion src/components/Campaign/Faq/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
z-index: -1;
width: 800px;
height: 800px;
background-image: radial-gradient(rgba(18, 255, 128, 0.3), rgba(18, 19, 18, 1) 80%);
background-image: radial-gradient(rgba(18, 255, 128, 0.5), rgba(18, 19, 18, 1) 80%);
filter: blur(50px);
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Campaign/Hero/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const Hero = (props: HeroEntry) => {
</Grid>

{isAsset(image) && image.fields.file?.url ? (
<Grid item md={5}>
<Grid item md={5} className={css.image}>
<img src={image.fields.file.url} alt={`Cover image for ${image.fields.description}`} />
</Grid>
) : undefined}
Expand Down
9 changes: 7 additions & 2 deletions src/components/Campaign/Hero/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
z-index: -1;
width: 800px;
height: 800px;
background-image: radial-gradient(rgba(18, 255, 128, 0.3), rgba(18, 19, 18, 0.15) 60%, rgba(18, 19, 18, 1) 100%);
filter: blur(30px);
background-image: radial-gradient(rgba(18, 255, 128, 0.5), rgba(18, 19, 18, 0.15) 60%, rgba(18, 19, 18, 1) 100%);
filter: blur(50px);
}

.textBlock {
Expand All @@ -34,6 +34,10 @@
margin: 0;
}

.image {
max-width: 500px;
}

.heroFooter {
display: flex;
flex-direction: column;
Expand Down Expand Up @@ -61,6 +65,7 @@

@media (min-width: 900px) {
.heroFooter {
margin-top: 100px;
flex-direction: row;
justify-content: space-between;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Campaign/RoundCardGrid/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
z-index: -1;
width: 800px;
height: 800px;
background-image: radial-gradient(rgba(18, 255, 128, 0.3), rgba(18, 19, 18, 1) 80%);
background-image: radial-gradient(rgba(18, 255, 128, 0.5), rgba(18, 19, 18, 1) 80%);
filter: blur(50px);
}

Expand Down
6 changes: 4 additions & 2 deletions src/components/Campaign/StepsImage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,21 @@ const StepsImage = (props: StepsImageEntry) => {
<Container>
<Grid container className={css.gridContainer}>
<div className={css.spot} />
<Grid item md={1} />
<Grid item md={5} className={css.stepListBlock}>
<List component="ol" className={css.listWrapper}>
{steps.map((item: any, index: number) => (
<ListItem key={index} className={css.listItem}>
<div className={css.listItemNumber}>{index}</div>
<div className={css.listItemNumber}>{index + 1}</div>
<ListItemText primary={<Typography variant="h4">{item}</Typography>} />
</ListItem>
))}
</List>
</Grid>
<Grid item md={2} />

{isAsset(image) && image.fields.file?.url ? (
<Grid item md={4}>
<Grid item md={4} className={css.image}>
<img src={image.fields.file.url} alt={`${image.fields.title}`} />
</Grid>
) : undefined}
Expand Down
17 changes: 13 additions & 4 deletions src/components/Campaign/StepsImage/styles.module.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
.gridContainer {
justify-content: space-between;
gap: 80px;
margin-top: 48px;
position: relative;
}
Expand All @@ -12,8 +10,8 @@
z-index: -1;
width: 800px;
height: 800px;
background-image: radial-gradient(rgba(18, 255, 128, 0.3), rgba(18, 19, 18, 0.15) 60%, rgba(18, 19, 18, 1) 100%);
filter: blur(30px);
background-image: radial-gradient(rgba(18, 255, 128, 0.5), rgba(18, 19, 18, 0.15) 60%, rgba(18, 19, 18, 1) 100%);
filter: blur(50px);
}

.stepListBlock {
Expand Down Expand Up @@ -50,3 +48,14 @@
align-items: center;
justify-content: center;
}

.image {
margin-top: 80px;
max-width: 330px;
}

@media (min-width: 600px) {
.image {
margin-top: 0px;
}
}
4 changes: 2 additions & 2 deletions src/components/Campaign/TextBlockCentered/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
z-index: -1;
width: 400px;
height: 400px;
background-image: radial-gradient(rgba(18, 255, 128, 0.3), rgba(18, 19, 18, 0.15) 60%, rgba(18, 19, 18, 1) 100%);
filter: blur(30px);
background-image: radial-gradient(rgba(18, 255, 128, 0.5), rgba(18, 19, 18, 0.15) 60%, rgba(18, 19, 18, 1) 100%);
filter: blur(50px);
}

.cta {
Expand Down
57 changes: 31 additions & 26 deletions src/components/Campaign/TextBlockList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,45 @@ import layoutCss from '@/components/common/styles.module.css'
import type { Entry } from 'contentful'
import type { TypeTextBlockListSkeleton } from '@/contentful/types'
import RichText from '@/components/Campaign/RichText'
import BackgroundImage from '@/public/images/Campaigns/faq-bg.png'
import Image from 'next/image'

type TextBlockListEntry = Entry<TypeTextBlockListSkeleton, undefined, string>

const TextBlockList = (props: TextBlockListEntry) => {
const { title, description, listItems, offset } = props.fields

return (
<Container className={layoutCss.containerMedium}>
<Grid container className={css.gridContainer} position="relative">
<div className={css.spot} />
{/* offset column */}
<Grid item lg={offset} />
<Grid item lg={6}>
<Typography variant="h1" className={css.title}>
<RichText {...title} />
</Typography>
<Typography mb={5} color="primary.light" width={{ sm: '100%', lg: '66.7%' }}>
{description}
</Typography>
<>
<Image className={css.bg} src={BackgroundImage} alt="blocks background" />
<Container className={layoutCss.containerMedium}>
<Grid container className={css.gridContainer} position="relative">
<div className={css.spot} />
{/* offset column */}
<Grid item lg={offset} />
<Grid item lg={6}>
<Typography variant="h1" className={css.title}>
<RichText {...title} />
</Typography>
<Typography mb={5} color="primary.light" width={{ sm: '100%', lg: '66.7%' }}>
{description}
</Typography>
</Grid>
<Grid item lg={6 - offset}>
<List>
{listItems.map((item: any, index: number) => (
<ListItem key={index}>
<ListItemIcon className={css.listItemIcon}>
<SvgIcon component={GreenCircleCheckmarkIcon} fontSize="inherit" color="inherit" inheritViewBox />
</ListItemIcon>
<ListItemText primary={<Typography variant="h4">{item}</Typography>} />
</ListItem>
))}
</List>
</Grid>
</Grid>
<Grid item lg={6 - offset}>
<List>
{listItems.map((item: any, index: number) => (
<ListItem key={index}>
<ListItemIcon className={css.listItemIcon}>
<SvgIcon component={GreenCircleCheckmarkIcon} fontSize="inherit" color="inherit" inheritViewBox />
</ListItemIcon>
<ListItemText primary={<Typography variant="h4">{item}</Typography>} />
</ListItem>
))}
</List>
</Grid>
</Grid>
</Container>
</Container>
</>
)
}

Expand Down
17 changes: 15 additions & 2 deletions src/components/Campaign/TextBlockList/styles.module.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.bg {
display: none;
}

.gridContainer {
position: relative;
}
Expand All @@ -9,8 +13,8 @@
z-index: -1;
width: 600px;
height: 600px;
background-image: radial-gradient(rgba(18, 255, 128, 0.3), rgba(18, 19, 18, 0.15) 60%, rgba(18, 19, 18, 1) 100%);
filter: blur(30px);
background-image: radial-gradient(rgba(18, 255, 128, 0.5), rgba(18, 19, 18, 0.15) 60%, rgba(18, 19, 18, 1) 100%);
filter: blur(50px);
}

.title {
Expand All @@ -32,3 +36,12 @@
min-width: min-content;
width: 24px;
}

@media (min-width: 900px) {
.bg {
display: block;
position: absolute;
left: 0px;
width: 66%;
}
}
2 changes: 1 addition & 1 deletion src/components/Campaign/TitleSpaceBetweenGrid/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const TitleSpaceBetweenGrid = (props: TitleSpaceBetweenGridEntry) => {
}))

return (
<Container className={layoutCss.containerShort}>
<Container className={layoutCss.container}>
<Typography variant="h2" textAlign="center" mb="60px">
{title}
</Typography>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
z-index: -1;
width: 600px;
height: 600px;
background-image: radial-gradient(rgba(18, 255, 128, 0.3), rgba(18, 19, 18, 0.15) 60%, rgba(18, 19, 18, 1) 100%);
background-image: radial-gradient(rgba(18, 255, 128, 0.4), rgba(18, 19, 18, 0.15) 60%, rgba(18, 19, 18, 1) 100%);
filter: blur(50px);
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Campaign/Tweets/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const Tweets = (props: TweetsEntry) => {

return (
<>
<Container className={layoutCss.containerMedium}>
<Container className={layoutCss.container}>
<div className={css.titleWrapper}>
<div className={css.spot} />
<Typography variant="h4" className={css.cta}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Campaign/Tweets/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
z-index: -1;
width: 700px;
height: 700px;
background-image: radial-gradient(rgba(18, 255, 128, 0.3), rgba(18, 19, 18, 1) 100%);
background-image: radial-gradient(rgba(18, 255, 128, 0.5), rgba(18, 19, 18, 1) 100%);
filter: blur(50px);
}

Expand Down

0 comments on commit 4ba8c27

Please sign in to comment.