Merge pull request #773 from lethemanh/772-fix-scroll-issue-on-mobile
#772 fix scroll issue on mobile
This commit is contained in:
@@ -3,6 +3,10 @@
|
|||||||
font-family "Roboto"
|
font-family "Roboto"
|
||||||
height 100vh
|
height 100vh
|
||||||
|
|
||||||
|
&--mobile
|
||||||
|
height 100dvh
|
||||||
|
overflow-y hidden
|
||||||
|
|
||||||
.App-header
|
.App-header
|
||||||
background-color #282c34
|
background-color #282c34
|
||||||
min-height 100vh
|
min-height 100vh
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import cx from 'classnames'
|
||||||
import { useAppDispatch, useAppSelector } from '@/app/hooks'
|
import { useAppDispatch, useAppSelector } from '@/app/hooks'
|
||||||
import SettingsPage from '@/features/Settings/SettingsPage'
|
import SettingsPage from '@/features/Settings/SettingsPage'
|
||||||
import { useScreenSizeDetection } from '@/useScreenSizeDetection'
|
import { useScreenSizeDetection } from '@/useScreenSizeDetection'
|
||||||
@@ -106,7 +107,7 @@ export default function CalendarLayout(): JSX.Element {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="App">
|
<div className={cx('App ', { 'App--mobile': isMobile })}>
|
||||||
{!isInIframe && <Menubar {...menubarProps} />}
|
{!isInIframe && <Menubar {...menubarProps} />}
|
||||||
{(view === 'calendar' || view === 'search') && (
|
{(view === 'calendar' || view === 'search') && (
|
||||||
<CalendarApp
|
<CalendarApp
|
||||||
|
|||||||
@@ -42,6 +42,11 @@
|
|||||||
min-height 60px
|
min-height 60px
|
||||||
background-color #fff
|
background-color #fff
|
||||||
|
|
||||||
|
&--mobile
|
||||||
|
position sticky
|
||||||
|
top 0
|
||||||
|
margin-bottom 8px
|
||||||
|
|
||||||
.menubar-item
|
.menubar-item
|
||||||
display flex
|
display flex
|
||||||
align-items center
|
align-items center
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ export const MobileMenubar: React.FC<MobileMenubarProps> = ({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<header className="menubar">
|
<header className="menubar menubar--mobile">
|
||||||
<div className="left-menu">
|
<div className="left-menu">
|
||||||
<IconButton
|
<IconButton
|
||||||
onClick={onOpenSidebar}
|
onClick={onOpenSidebar}
|
||||||
|
|||||||
@@ -1,5 +1,22 @@
|
|||||||
declare module '*.styl'
|
declare module '*.styl'
|
||||||
|
|
||||||
|
declare module 'classnames' {
|
||||||
|
type ClassValue =
|
||||||
|
| string
|
||||||
|
| number
|
||||||
|
| boolean
|
||||||
|
| null
|
||||||
|
| undefined
|
||||||
|
| ClassArray
|
||||||
|
| ClassDictionary
|
||||||
|
interface ClassDictionary {
|
||||||
|
[id: string]: boolean | undefined | null
|
||||||
|
}
|
||||||
|
type ClassArray = ClassValue[]
|
||||||
|
function classnames(...args: ClassValue[]): string
|
||||||
|
export = classnames
|
||||||
|
}
|
||||||
|
|
||||||
declare module '@linagora/twake-mui' {
|
declare module '@linagora/twake-mui' {
|
||||||
export * from '@mui/material'
|
export * from '@mui/material'
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user