Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
Fixed some issues with mobile styling, particularly homepage. (#7205)
Browse files Browse the repository at this point in the history
Homepage was stretching beyond edge of screen on mobile devices. Fixed this so that main contents
scroll, while header and social footer are fixed.

Editor Projects Page now scrolls on mobile as well.

Made Other Audio Settings selector be the row the button is in rather than just the arrow.

Co-authored-by: Hanzla Mateen <hanzlamateen@live.com>
  • Loading branch information
barankyle and hanzlamateen authored Nov 11, 2022
1 parent 4322560 commit 73b7d23
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ const SettingDetailView = () => {
}}
/>
</div>
<div className="sectionRow justifySpaceBetween">
<div className="sectionRow justifySpaceBetween" onClick={toggleShowOtherAudioSettings}>
<h4 className="title">{t('user:usermenu.setting.other-audio-setting')}</h4>
<div xr-layer="true" className="showHideButton" onClick={toggleShowOtherAudioSettings}>
<div xr-layer="true" className="showHideButton">
{showAudioDetails ? 'hide details' : 'show details'}
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,8 @@
max-height: calc(100vh - 150px);
touch-action: auto;
overflow-y: auto;
max-width: 95%;
margin: auto;

* {
touch-action: auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -474,16 +474,14 @@ const SettingMenu = ({ changeActiveMenu, isPopover }: Props): JSX.Element => {
/>
</div>
<section className={styles.settingSection}>
<div className={styles.row}>
<div
className={styles.row}
onClick={() => setOpenOtherAudioSettings(!openOtherAudioSettings)}
onPointerUp={() => AudioEffectPlayer.instance.play(AudioEffectPlayer.SOUNDS.ui)}
onPointerEnter={() => AudioEffectPlayer.instance.play(AudioEffectPlayer.SOUNDS.ui)}
>
<div className={styles.settingHeader}>{t('user:usermenu.setting.other-audio-setting')}</div>
<IconButton
className={styles.collapseBtn}
aria-label="expand"
size="small"
onClick={() => setOpenOtherAudioSettings(!openOtherAudioSettings)}
onPointerUp={() => AudioEffectPlayer.instance.play(AudioEffectPlayer.SOUNDS.ui)}
onPointerEnter={() => AudioEffectPlayer.instance.play(AudioEffectPlayer.SOUNDS.ui)}
>
<IconButton className={styles.collapseBtn} aria-label="expand" size="small">
{openOtherAudioSettings ? <KeyboardArrowUpIcon /> : <KeyboardArrowDownIcon />}
</IconButton>
</div>
Expand Down
1 change: 0 additions & 1 deletion packages/client/src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ export const HomePage = (): any => {
top: 0px;
left: 0px;
width: 100%;
min-width: 420px;
transform: none;
pointer-events: auto;
}
Expand Down
1 change: 0 additions & 1 deletion packages/client/src/pages/room.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ export const RoomPage = (): any => {
top: 0px;
left: 0px;
width: 100%;
min-width: 420px;
transform: none;
pointer-events: auto;
}
Expand Down
22 changes: 18 additions & 4 deletions packages/client/src/pages/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,12 @@ body {
}

.lander {
min-height: 100vh;
background-image: linear-gradient(150deg, #00022e, #dbdbdb 100%);
height: 100%;
background-image: linear-gradient(150deg, #00022e, #ff007d4a);
position: relative;
overflow: hidden;
display: flex;
flex-direction: column;

* {
font-family: Inter;
Expand Down Expand Up @@ -427,11 +428,11 @@ body {
.main-section {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 5px;
max-width: 1024px;
margin: auto;
width: 100%;
overflow-y: auto;

.desc {
font-size: 30px;
Expand Down Expand Up @@ -471,3 +472,16 @@ vite-error-overlay {
.prompt-box-8w {
pointer-events: auto;
}


#root {
height: 100%;

.fullscreen {
height: 100%;
}

#engine-container {
height: 100%;
}
}
4 changes: 4 additions & 0 deletions packages/editor/src/components/projects/ProjectsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,10 @@ const ProjectsPage = () => {
#menu-tagData {
z-index: 1500;
}
#engine-container {
display: flex;
flex-direction: column;
}
`}
</style>
<div className={styles.projectPageContainer}>
Expand Down
2 changes: 2 additions & 0 deletions packages/editor/src/components/projects/styles.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
display: flex;
background-color: var(--mainBackground);
pointer-events: auto;
max-height: 100%;
}

.projectPageContainer {
Expand All @@ -67,6 +68,7 @@
border-radius: 10px;
min-height: calc(100vh - 110px);
max-width: 1280px;
overflow-y: auto;

.projectGridContainer {
display: flex;
Expand Down

0 comments on commit 73b7d23

Please sign in to comment.