Browse Source

fix(mobile): toggle tablet content layout based on online state. Closes #3003 (#3007)

pull/2980/head
Gabe Kangas 2 years ago committed by GitHub
parent
commit
e694d76ad2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      web/components/ui/Content/Content.module.scss
  2. 1
      web/components/ui/Content/Content.tsx
  3. 5
      web/components/ui/Content/MobileContent.tsx

11
web/components/ui/Content/Content.module.scss

@ -14,8 +14,7 @@ @@ -14,8 +14,7 @@
width: 100%;
@include screen(tablet) {
//sets the position of tabbed content for online mode
top: 430px;
position: relative;
}
@include screen(mobile) {
@ -30,6 +29,14 @@ @@ -30,6 +29,14 @@
}
}
.online {
@include screen(tablet) {
//sets the position of tabbed content for online mode
position: absolute;
top: 430px;
}
}
.mobileNoTabs {
padding-top: 20px;
}

1
web/components/ui/Content/Content.tsx

@ -268,6 +268,7 @@ export const Content: FC = () => { @@ -268,6 +268,7 @@ export const Content: FC = () => {
setShowFollowModal={setShowFollowModal}
supportFediverseFeatures={supportFediverseFeatures}
chatEnabled={isChatAvailable}
online={online}
/>
) : (
<Col span={24} style={{ paddingRight: dynamicPadding }}>

5
web/components/ui/Content/MobileContent.tsx

@ -2,6 +2,7 @@ import React, { ComponentType, FC } from 'react'; @@ -2,6 +2,7 @@ import React, { ComponentType, FC } from 'react';
import dynamic from 'next/dynamic';
import { Skeleton, TabsProps } from 'antd';
import { ErrorBoundary } from 'react-error-boundary';
import classNames from 'classnames';
import { SocialLink } from '../../../interfaces/social-link.model';
import styles from './Content.module.scss';
import { CustomPageContent } from '../CustomPageContent/CustomPageContent';
@ -22,6 +23,7 @@ export type MobileContentProps = { @@ -22,6 +23,7 @@ export type MobileContentProps = {
currentUser: CurrentUser;
showChat: boolean;
chatEnabled: boolean;
online: boolean;
};
// lazy loaded components
@ -90,6 +92,7 @@ export const MobileContent: FC<MobileContentProps> = ({ @@ -90,6 +92,7 @@ export const MobileContent: FC<MobileContentProps> = ({
chatEnabled,
setShowFollowModal,
supportFediverseFeatures,
online,
}) => {
const aboutTabContent = (
<>
@ -134,7 +137,7 @@ export const MobileContent: FC<MobileContentProps> = ({ @@ -134,7 +137,7 @@ export const MobileContent: FC<MobileContentProps> = ({
<ComponentErrorFallback error={error} resetErrorBoundary={resetErrorBoundary} />
)}
>
<div className={styles.lowerSectionMobile}>
<div className={classNames([styles.lowerSectionMobile, online && styles.online])}>
{items.length > 1 && <Tabs defaultActiveKey="0" items={items} />}
</div>
<div className={styles.mobileNoTabs}>{items.length <= 1 && aboutTabContent}</div>

Loading…
Cancel
Save