diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-01-19 18:28:37 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-19 18:28:37 +0100 |
commit | 5e0cf92fd145b27053389e5ffcce48da77439713 (patch) | |
tree | 27e1567b240f1a3117de595413ccceb9222d8465 /app/javascript/mastodon/features/ui/components/columns_area.js | |
parent | 530d29148ca0c5bf29f6fa516b1ef4f91d95894b (diff) | |
parent | 7c3fddeab4c4ddebca7d5441ac67870aa1cecfe4 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
No conflicts.
Diffstat (limited to 'app/javascript/mastodon/features/ui/components/columns_area.js')
-rw-r--r-- | app/javascript/mastodon/features/ui/components/columns_area.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js index ed338c2eb..b7e350cbc 100644 --- a/app/javascript/mastodon/features/ui/components/columns_area.js +++ b/app/javascript/mastodon/features/ui/components/columns_area.js @@ -33,7 +33,7 @@ const messages = defineMessages({ publish: { id: 'compose_form.publish', defaultMessage: 'Toot' }, }); -const shouldHideFAB = path => path.match(/^\/statuses\//); +const shouldHideFAB = path => path.match(/^\/statuses\/|^\/search|^\/getting-started/); export default @(component => injectIntl(component, { withRef: true })) class ColumnsArea extends ImmutablePureComponent { |