Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Various improvements to single column layout (#10809)

Browse source 
- Add potential side panels to single column layout
- Hide FAB on large screens
This commit is contained in:
Eugen Rochko 2019-05-23 20:01:10 +02:00 • committed by GitHub
parent 9a5561a5b8
commit 84dc21d55d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/javascript/mastodon/features/ui/components/columns_area.js
View file

@ -163,21 +163,28 @@ class ColumnsArea extends ImmutablePureComponent {
if (singleColumn) {
const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><Icon id='pencil' /></Link>;
return columnIndex !== -1 ? [
<TabsBar key='tabs' />,
const content = columnIndex !== -1 ? (
<ReactSwipeableViews key='content' index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }}>
{links.map(this.renderView)}
</ReactSwipeableViews>,
</ReactSwipeableViews>
) : (
<div key='content' className='columns-area columns-area--mobile'>{children}</div>
);
floatingActionButton,
] : [
<TabsBar key='tabs' />,
return (
<div className='columns-area__panels'>
<div className='columns-area__panels__pane' />
<div key='content' className='columns-area columns-area--mobile'>{children}</div>,
<div className='columns-area__panels__main'>
<TabsBar key='tabs' />
{content}
</div>
floatingActionButton,
];
<div className='columns-area__panels__pane' />
{floatingActionButton}
</div>
);
}
return (