Standardize bottom section background + fix mobile tabs not hiding. Closes #2685

This commit is contained in:
Gabe Kangas
2023-02-21 16:15:09 -08:00
parent 684e92f3d2
commit 3bb73af1c2
5 changed files with 41 additions and 25 deletions

View File

@@ -61,6 +61,7 @@
.lowerSectionMobile { .lowerSectionMobile {
display: flex; display: flex;
flex-direction: column;
flex-grow: 1; flex-grow: 1;
flex-shrink: 0; flex-shrink: 0;
padding: 0.3em; padding: 0.3em;
@@ -125,3 +126,11 @@
} }
} }
} }
.bottomPageContentContainer {
background-color: var(--theme-color-components-content-background);
padding: calc(2 * var(--content-padding));
padding-top: 0px;
border-radius: var(--theme-rounded-corners);
width: 100%;
}

View File

@@ -43,9 +43,14 @@ export const DesktopContent: FC<DesktopContentProps> = ({
setShowFollowModal, setShowFollowModal,
supportFediverseFeatures, supportFediverseFeatures,
}) => { }) => {
const aboutTabContent = <CustomPageContent content={extraPageContent} />; const aboutTabContent = (
<div className={styles.bottomPageContentContainer}>
<CustomPageContent content={extraPageContent} />
</div>
);
const followersTabContent = ( const followersTabContent = (
<div> <div className={styles.bottomPageContentContainer}>
<FollowerCollection name={name} onFollowButtonClick={() => setShowFollowModal(true)} /> <FollowerCollection name={name} onFollowButtonClick={() => setShowFollowModal(true)} />
</div> </div>
); );

View File

@@ -95,18 +95,25 @@ export const MobileContent: FC<MobileContentProps> = ({
links={socialHandles} links={socialHandles}
logo="/logo" logo="/logo"
/> />
<CustomPageContent content={extraPageContent} /> <div className={styles.bottomPageContentContainer}>
<CustomPageContent content={extraPageContent} />
</div>
</> </>
); );
const followersTabContent = ( const followersTabContent = (
<FollowerCollection name={name} onFollowButtonClick={() => setShowFollowModal(true)} /> <div className={styles.bottomPageContentContainer}>
<FollowerCollection name={name} onFollowButtonClick={() => setShowFollowModal(true)} />
</div>
); );
const items = [ const items = [];
showChat && { label: 'Chat', key: '0', children: chatContent }, if (showChat) {
{ label: 'About', key: '2', children: aboutTabContent }, items.push({ label: 'Chat', key: '0', children: chatContent });
{ label: 'Followers', key: '3', children: followersTabContent }, }
]; items.push({ label: 'About', key: '2', children: aboutTabContent });
if (supportFediverseFeatures) {
items.push({ label: 'Followers', key: '3', children: followersTabContent });
}
const replacementTabBar = (props, DefaultTabBar) => ( const replacementTabBar = (props, DefaultTabBar) => (
<div className={styles.replacementBar}> <div className={styles.replacementBar}>
@@ -125,12 +132,16 @@ export const MobileContent: FC<MobileContentProps> = ({
return ( return (
<div className={styles.lowerSectionMobile}> <div className={styles.lowerSectionMobile}>
<Tabs {items.length > 1 ? (
className={styles.tabs} <Tabs
defaultActiveKey="0" className={styles.tabs}
items={items} defaultActiveKey="0"
renderTabBar={replacementTabBar} items={items}
/> renderTabBar={replacementTabBar}
/>
) : (
aboutTabContent
)}
</div> </div>
); );
}; };

View File

@@ -8,10 +8,6 @@
font-size: 1rem; font-size: 1rem;
line-height: 1.6em; line-height: 1.6em;
color: var(--theme-color-components-text-on-light); color: var(--theme-color-components-text-on-light);
padding: calc(2 * var(--content-padding));
border-radius: var(--theme-rounded-corners);
width: 100%;
background-color: var(--theme-color-components-content-background);
hr { hr {
margin: 1.35em 0; margin: 1.35em 0;

View File

@@ -4,10 +4,6 @@
width: 100%; width: 100%;
padding: 5px; padding: 5px;
@include screen(desktop) {
background-color: var(--theme-color-components-content-background);
}
@include screen(mobile) { @include screen(mobile) {
.followerRow { .followerRow {
justify-content: center; justify-content: center;
@@ -16,10 +12,9 @@
} }
.noFollowers { .noFollowers {
padding: calc(2 * var(--content-padding)); padding: var(--content-padding);
border-radius: var(--theme-rounded-corners); border-radius: var(--theme-rounded-corners);
width: 100%; width: 100%;
background-color: var(--theme-color-components-content-background);
} }
.pagination { .pagination {