diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-08 04:17:11 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-08 04:17:11 +0000 |
| commit | 722b3f567f18ae31b05f320441c73279b4f5ad11 (patch) | |
| tree | 8e009982fa512566ce7172c8b4fe610be38d5c39 /app/javascript | |
| parent | f7c4d4464ba3b3729d707c54c4d2aa7515a9fe57 (diff) | |
| parent | e4a241abefaa68492938c3fbb7e5e5401d12138e (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/features/compose/index.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js index c3e936ab9..3f75a218d 100644 --- a/app/javascript/mastodon/features/compose/index.js +++ b/app/javascript/mastodon/features/compose/index.js @@ -94,7 +94,7 @@ export default class Compose extends React.PureComponent { <div className='drawer__inner' onFocus={this.onFocus}> <NavigationContainer onClose={this.onBlur} /> <ComposeFormContainer /> - <div className='mastodon' /> + {multiColumn && <div className='mastodon' />} </div> <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}> |