Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1846 redesign header #1871

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

1846 redesign header #1871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d5fc8c3
pullMerge branch 'main' of https://github.com/hackforla/311-data
bphan002 Oct 26, 2024
2ee181b
Merge branch 'main' of https://github.com/bphan002/311-data
bphan002 Oct 26, 2024
d4db3e5
Merge branch 'main' of https://github.com/hackforla/311-data
bphan002 Nov 2, 2024
61aed21
uMerge branch 'main' of https://github.com/hackforla/311-data
bphan002 Nov 12, 2024
a613f41
Merge branch 'hackforla:main' into main
bphan002 Nov 12, 2024
861b979
Merge branch 'main' of https://github.com/bphan002/311-data
bphan002 Nov 12, 2024
6d9fa4a
add background picture to assets
bphan002 Nov 12, 2024
66252ab
image overlay
bphan002 Nov 12, 2024
734c05b
Merge branch 'main' of https://github.com/hackforla/311-data into 184…
bphan002 Nov 23, 2024
2edd2d1
overlay on banner complete for all banner pages
bphan002 Nov 23, 2024
4ac0dc6
remove expo file
bphan002 Nov 23, 2024
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
Binary file added assets/city_background_header.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 12 additions & 3 deletions components/common/TextHeading/TextHeadingFAQ.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,22 @@ import PropTypes from 'prop-types';
import React from 'react';
import makeStyles from '@mui/styles/makeStyles';
import Typography from '@mui/material/Typography';
import cityBackground from '@assets/city_background_header.png'

const useStyles = makeStyles(theme => ({
headingBackground: {
background: theme.palette.primary.main,
backgroundPosition: 'top',
height: '30vh',
background: `url(${cityBackground}) center 57% / cover`,
backgroundPosition: 'center 57%',
width: '100%',
height: '240px',
position: 'relative',
},
backdrop: {
width: '100%',
height: '100%',
background: `linear-gradient(180deg, rgba(53, 82, 129, 0.4) 50%, rgba(41, 64, 79, 0.8) 100%, rgba(29, 63, 90, 0.4) 100%)`,
backgroundPosition: 'center',
},
headingOverlayText: {
left: '50%',
color: 'white',
Expand All @@ -31,6 +39,7 @@ function TextHeadingFAQ({ children }) {

return (
<div className={classes.headingBackground}>
<div className={classes.backdrop}></div>
<div className={classes.headingOverlayText}>
<Typography variant="h3" className={classes.contentHeading}>
<div>{children}</div>
Expand Down
16 changes: 13 additions & 3 deletions components/common/TextHeading/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,30 @@ import PropTypes from 'prop-types';
import React from 'react';
import makeStyles from '@mui/styles/makeStyles';
import Typography from '@mui/material/Typography';
import cityBackground from '@assets/city_background_header.png'

const useStyles = makeStyles(theme => ({
headingBackground: {
background: theme.palette.primary.main,
backgroundPosition: 'top',
height: '20vh',
background: `url(${cityBackground}) center 57% / cover`,
backgroundPosition: 'center 57%',
width: '100%',
height: '240px',
position: 'relative',
},
backdrop: {
width: '100%',
height: '100%',
background: `linear-gradient(180deg, rgba(53, 82, 129, 0.4) 50%, rgba(41, 64, 79, 0.8) 100%, rgba(29, 63, 90, 0.4) 100%)`,
backgroundPosition: 'center',
},
headingOverlayText: {
left: '50%',
color: 'white',
position: 'absolute',
textAlign: 'center',
top: '50%',
transform: 'translate(-50%, -70%)',
zIndex: '1',
},
contentHeading: {
fontWeight: theme.typography.fontWeightBold,
Expand All @@ -31,6 +40,7 @@ function TextHeading({ children }) {

return (
<div className={classes.headingBackground}>
<div className={classes.backdrop}></div>
<div className={classes.headingOverlayText}>
<Typography variant="h3" className={classes.contentHeading}>
<div>
Expand Down