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

Fixed some issues with mobile styling, particularly homepage. #7205

Merged
merged 3 commits into from
Nov 11, 2022
Merged

Fixed some issues with mobile styling, particularly homepage. #7205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
590f4b5
Fixed some issues with mobile styling, particularly homepage.
barankyle Nov 11, 2022
257f728
Merge branch 'dev' into fix-mobile-scrolling
barankyle Nov 11, 2022
6a17c6c
Merge branch 'dev' into fix-mobile-scrolling
hanzlamateen Nov 11, 2022
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
4 changes: 2 additions & 2 deletions packages/client-core/src/systems/ui/SettingDetailView/index.tsx
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions packages/client-core/src/user/components/UserMenu/index.module.scss
View file
Open in desktop
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
16 changes: 7 additions & 9 deletions packages/client-core/src/user/components/UserMenu/menus/SettingMenu.tsx
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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