diff options
| author | ThibG <thib@sitedethib.com> | 2019-10-07 12:02:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 12:02:20 +0200 |
| commit | d2f7b8685cfd0ec9b69af505b56c791d9b5f1c82 (patch) | |
| tree | 79e8fa613494ae37fe2adfb41bf9ba38f0ffd80d /app/javascript/flavours/glitch/features/direct_timeline | |
| parent | 3921125e5578fb3871fdcae0e8e8a77179f1ad72 (diff) | |
| parent | 0fbe36e3fb4644945eeb0c142045a003e2793b19 (diff) | |
Merge pull request #1229 from ThibG/glitch-soc/features/upstream-scroll-behavior
Merge upstream changes to scroll behavior in single column
Diffstat (limited to 'app/javascript/flavours/glitch/features/direct_timeline')
| -rw-r--r-- | app/javascript/flavours/glitch/features/direct_timeline/index.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/index.js b/app/javascript/flavours/glitch/features/direct_timeline/index.js index e2c0a439a..7741c6922 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/index.js +++ b/app/javascript/flavours/glitch/features/direct_timeline/index.js @@ -135,7 +135,7 @@ class DirectTimeline extends React.PureComponent { } return ( - <Column ref={this.setRef} label={intl.formatMessage(messages.title)}> + <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}> <ColumnHeader icon='envelope' active={hasUnread} |