fix style in app share (#995)

This commit is contained in:
crazywoola 2023-08-24 17:57:25 +08:00 committed by GitHub
parent ef61e1487f
commit f13623184a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 12 deletions

View File

@ -1,4 +1,4 @@
import React from "react"; import React from 'react'
import type { FC } from 'react' import type { FC } from 'react'
import GA, { GaType } from '@/app/components/base/ga' import GA, { GaType } from '@/app/components/base/ga'
@ -6,13 +6,11 @@ const Layout: FC<{
children: React.ReactNode children: React.ReactNode
}> = ({ children }) => { }> = ({ children }) => {
return ( return (
<div className="overflow-x-auto"> <div className="min-w-[300px]">
<div className="w-screen h-screen min-w-[300px]"> <GA gaType={GaType.webapp} />
<GA gaType={GaType.webapp} /> {children}
{children}
</div>
</div> </div>
) )
} }
export default Layout export default Layout

View File

@ -574,7 +574,7 @@ const Main: FC<IMainProps> = ({
return <Loading type='app' /> return <Loading type='app' />
return ( return (
<div className='bg-gray-100'> <div className='bg-gray-100 flex w-full h-full'>
{!isInstalledApp && ( {!isInstalledApp && (
<Header <Header
title={siteInfo.title} title={siteInfo.title}
@ -588,7 +588,7 @@ const Main: FC<IMainProps> = ({
<div <div
className={cn( className={cn(
'flex rounded-t-2xl bg-white overflow-hidden', 'flex rounded-t-2xl bg-white overflow-hidden h-full w-full',
isInstalledApp && 'rounded-b-2xl', isInstalledApp && 'rounded-b-2xl',
)} )}
style={isInstalledApp style={isInstalledApp
@ -611,7 +611,7 @@ const Main: FC<IMainProps> = ({
)} )}
{/* main */} {/* main */}
<div className={cn( <div className={cn(
isInstalledApp ? s.installedApp : 'h-[calc(100vh_-_3rem)]', isInstalledApp ? s.installedApp : '',
'flex-grow flex flex-col overflow-y-auto', 'flex-grow flex flex-col overflow-y-auto',
) )
}> }>

View File

@ -85,7 +85,7 @@ const Sidebar: FC<ISidebarProps> = ({
<div <div
className={ className={
cn( cn(
(isInstalledApp || isUniversalChat) ? 'tablet:h-[calc(100vh_-_74px)]' : 'tablet:h-[calc(100vh_-_3rem)]', (isInstalledApp || isUniversalChat) ? 'tablet:h-[calc(100vh_-_74px)]' : '',
'shrink-0 flex flex-col bg-white pc:w-[244px] tablet:w-[192px] mobile:w-[240px] border-r border-gray-200 mobile:h-screen', 'shrink-0 flex flex-col bg-white pc:w-[244px] tablet:w-[192px] mobile:w-[240px] border-r border-gray-200 mobile:h-screen',
) )
} }

View File

@ -510,7 +510,7 @@ const Main: FC<IMainProps> = ({
<div className={'flex bg-white overflow-hidden'}> <div className={'flex bg-white overflow-hidden'}>
<div className={cn( <div className={cn(
isInstalledApp ? s.installedApp : 'h-[calc(100vh_-_3rem)]', isInstalledApp ? s.installedApp : '',
'flex-grow flex flex-col overflow-y-auto', 'flex-grow flex flex-col overflow-y-auto',
) )
}> }>