tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore navigation bar position glitch-soc setting

Browse Source
This commit is contained in:
Thibaut Girka
2019-06-12 17:30:36 +02:00
committed by ThibG
parent b191861e15
commit 127ead34c4
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/features/ui/components/columns_area.js
View File

@@ -51,6 +51,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
swipeToChangeColumns: PropTypes.bool,
singleColumn: PropTypes.bool,
children: PropTypes.node,
navbarUnder: PropTypes.bool,
};
state = {
@@ -156,7 +157,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
}
render () {
const { columns, children, singleColumn, swipeToChangeColumns, intl } = this.props;
const { columns, children, singleColumn, swipeToChangeColumns, intl, navbarUnder } = this.props;
const { shouldAnimate } = this.state;
const columnIndex = getIndex(this.context.router.history.location.pathname);
@@ -182,8 +183,9 @@ export default class ColumnsArea extends ImmutablePureComponent {
</div>
<div className='columns-area__panels__main'>
<TabsBar key='tabs' />
{!navbarUnder && <TabsBar key='tabs' />}
{content}
{navbarUnder && <TabsBar key='tabs' />}
</div>
<div className='columns-area__panels__pane columns-area__panels__pane--start columns-area__panels__pane--navigational'>