about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/components/status.js
diff options
context:
space:
mode:
authorSpencer Alves <impiaaa@gmail.com>2018-09-29 16:44:02 -0700
committerThibG <thib@sitedethib.com>2018-09-30 08:31:50 +0200
commit4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (patch)
tree1316be5ae22312e4ad5f21ee0a0f8b09e2b38a1b /app/javascript/flavours/glitch/components/status.js
parentc065717b6765435e7374975ae9d71ebaa224f92c (diff)
Add option to hide action bar in collapsed toots
Diffstat (limited to 'app/javascript/flavours/glitch/components/status.js')
-rw-r--r--app/javascript/flavours/glitch/components/status.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js
index 4d47660c2..665aa457a 100644
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@@ -566,7 +566,7 @@ export default class Status extends ImmutablePureComponent {
             parseClick={parseClick}
             disabled={!router}
           />
-          {!isCollapsed || !muted ? (
+          {!isCollapsed || !(muted || !settings.getIn(['collapsed', 'show_action_bar'])) ? (
             <StatusActionBar
               {...other}
               status={status}