Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00
parent 8b9d0a0533
commit 2dee293c4c
26 changed files with 55 additions and 30 deletions
--- a/app/javascript/mastodon/features/keyboard_shortcuts/index.js
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.js
@ -18,10 +18,10 @@ class KeyboardShortcuts extends ImmutablePureComponent {
  };

  render () {
-    const { intl } = this.props;
+    const { intl, multiColumn } = this.props;

    return (
-      <Column icon='question' heading={intl.formatMessage(messages.heading)}>
+      <Column bindToDocument={!multiColumn} icon='question' heading={intl.formatMessage(messages.heading)}>
        <ColumnBackButtonSlim />
        <div className='keyboard-shortcuts scrollable optionally-scrollable'>
          <table>