feat: updates

This commit is contained in:
qier222 2022-06-30 00:02:21 +08:00
parent 793db0127c
commit 0b4baa3eff
No known key found for this signature in database
GPG key ID: 9C85007ED905F14D
8 changed files with 141 additions and 76 deletions

View file

@ -6,7 +6,7 @@ import { useSnapshot } from 'valtio'
import Router from '@/web/components/New/Router'
import MenuBar from './MenuBar'
import Topbar from './Topbar/TopbarMobile'
import { isIOS, isPWA, isSafari } from '@/web/utils/common'
import { isIOS, isIosPwa, isPWA, isSafari } from '@/web/utils/common'
import Login from './Login'
import { useLocation } from 'react-router-dom'
import PlayingNext from './PlayingNextMobile'
@ -17,8 +17,8 @@ const LayoutMobile = () => {
const location = useLocation()
return (
<div id='layout' className='select-none bg-white pb-28 dark:bg-black'>
<main className='min-h-screen overflow-y-auto overflow-x-hidden pb-16'>
<div id='layout' className='bg-white select-none pb-28 dark:bg-black'>
<main className='min-h-screen pb-16 overflow-x-hidden overflow-y-auto'>
{location.pathname === '/' && <Topbar />}
<Router />
</main>
@ -27,9 +27,7 @@ const LayoutMobile = () => {
'fixed bottom-0 left-0 right-0 z-20 pt-3 dark:bg-black',
css`
padding-bottom: calc(
${isIOS && isSafari && isPWA
? '24px'
: 'env(safe-area-inset-bottom)'} + 0.75rem
${isIosPwa ? '24px' : 'env(safe-area-inset-bottom)'} + 0.75rem
);
`
)}
@ -40,7 +38,7 @@ const LayoutMobile = () => {
'absolute left-7 right-7 z-20',
css`
top: calc(
-100% - 6px + ${isIOS && isSafari && isPWA ? '24px' : 'env(safe-area-inset-bottom)'}
-100% - 6px + ${isIosPwa ? '24px' : 'env(safe-area-inset-bottom)'}
);
`
)}
@ -56,7 +54,7 @@ const LayoutMobile = () => {
<Login />
{/* Notch background */}
{isIOS && isSafari && isPWA && (
{isIosPwa && (
<div
className={cx(
'fixed left-0 right-0 bg-black/30 backdrop-blur-sm',