Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-08 04:17:11 +00:00
parent f7c4d4464b e4a241abef
commit 722b3f567f
6 changed files with 65 additions and 27 deletions
--- 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 }) }}>