mirror of
https://github.com/mastodon/mastodon.git
synced 2026-09-13 16:26:15 -05:00
Remove duplicate simplified layout check (#40060)
This commit is contained in:
@@ -121,6 +121,7 @@ class SwitchingColumnsArea extends PureComponent {
|
||||
singleColumn: PropTypes.bool,
|
||||
layout: PropTypes.string.isRequired,
|
||||
forceOnboarding: PropTypes.bool,
|
||||
minimalShell: PropTypes.bool,
|
||||
};
|
||||
|
||||
componentDidMount () {
|
||||
@@ -158,7 +159,7 @@ class SwitchingColumnsArea extends PureComponent {
|
||||
};
|
||||
|
||||
render () {
|
||||
const { children, singleColumn, forceOnboarding } = this.props;
|
||||
const { children, singleColumn, forceOnboarding, minimalShell } = this.props;
|
||||
const { signedIn } = this.props.identity;
|
||||
const pathName = this.props.location.pathname;
|
||||
|
||||
@@ -185,7 +186,7 @@ class SwitchingColumnsArea extends PureComponent {
|
||||
|
||||
return (
|
||||
<ColumnsContextProvider multiColumn={!singleColumn}>
|
||||
<ColumnsArea ref={this.setRef} singleColumn={singleColumn} domain={domain} minimalShell={!signedIn && landingPage === 'overview' && pathName.startsWith('/overview')}>
|
||||
<ColumnsArea ref={this.setRef} singleColumn={singleColumn} domain={domain} minimalShell={minimalShell}>
|
||||
<WrappedSwitch>
|
||||
<Redirect from='/' to={{pathname: rootRedirect, state: {...this.props.location.state, focusTarget: false}}} exact />
|
||||
|
||||
@@ -651,6 +652,7 @@ class UI extends PureComponent {
|
||||
singleColumn={layout === 'mobile' || layout === 'single-column'}
|
||||
layout={layout}
|
||||
forceOnboarding={firstLaunch && newAccount}
|
||||
minimalShell={minimalShell}
|
||||
>
|
||||
{children}
|
||||
</SwitchingColumnsArea>
|
||||
|
||||
Reference in New Issue
Block a user