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

Spicer/z index ads click #568

Merged
merged 3 commits into from
Mar 14, 2024
Merged

Spicer/z index ads click #568

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b03fde1
Added some classes for easy z-index debugging.
Mar 14, 2024
9952ffa
More z-index changes to support ads better
Mar 14, 2024
df230a0
Merge branch 'master' into spicer/z-index-ads-click
spicermatthews Mar 14, 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
10 changes: 5 additions & 5 deletions src/pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ const useStyles = makeStyles((theme) => ({
display: 'flex',
justifyContent: 'flex-end',
alignContent: 'flex-start',
height: '100%',
position: 'relative',
zIndex: 1e6, // must be higher than all content besides ads and modal
},
Expand Down Expand Up @@ -276,9 +275,10 @@ const useStyles = makeStyles((theme) => ({
flexDirection: 'row-reverse', // swap to move ads to opposite side
bottom: 0,
right: 0,
left: 0,
pointerEvents: 'none', // don't block the main page
zIndex: 1.5e3,
width: 350,
minHeight: 600,
},
adsContainerRectangles: {
display: 'flex',
Expand Down Expand Up @@ -767,9 +767,9 @@ const Index = ({ data: fallbackData, userAgent }) => {
{enableBackgroundImages ? (
<UserBackgroundImageContainer user={user} />
) : null}
<div className={classes.fullContainer}>
<div className={classes.topContainer}>
<div className={classes.topRightContainer}>
<div className={classes.fullContainer} id="full-container">
<div className={classes.topContainer} id="top-container">
<div className={classes.topRightContainer} id="right-container">
<div className={classes.userMenuContainer}>
{missionsFeatureEnabled ? (
<MissionHubButton status={missionStatus} />
Expand Down
Loading