about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/components
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-03-19 15:41:09 -0500
committerGitHub <noreply@github.com>2018-03-19 15:41:09 -0500
commitc074b226b68d81b0503f935dc81b74cd11b11d67 (patch)
tree3f818a151886a551d05259f531943cbe41490626 /app/javascript/flavours/glitch/components
parentab04be2f84132e6b6a83ca86cbabf2cdf13f5894 (diff)
parent5b00b8f0da5b54fc5d92cec19cbd54c0a10255d6 (diff)
Merge pull request #394 from ashkitten/compressed-notifs
fix compressed notifications again (#393)
Diffstat (limited to 'app/javascript/flavours/glitch/components')
-rw-r--r--app/javascript/flavours/glitch/components/status.js34
1 files changed, 18 insertions, 16 deletions
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js
index e8105e705..b8fb5383a 100644
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@@ -394,22 +394,24 @@ export default class Status extends ImmutablePureComponent {
           tabIndex='0'
         >
           <header className='status__info'>
-            {prepend && account ? (
-              <StatusPrepend
-                type={prepend}
-                account={account}
-                parseClick={parseClick}
-                notificationId={this.props.notificationId}
-              />
-            ) : null}
-            {!muted ? (
-              <StatusHeader
-                status={status}
-                friend={account}
-                collapsed={isExpanded === false}
-                parseClick={parseClick}
-              />
-            ) : null}
+            <span>
+              {prepend && account ? (
+                <StatusPrepend
+                  type={prepend}
+                  account={account}
+                  parseClick={parseClick}
+                  notificationId={this.props.notificationId}
+                />
+              ) : null}
+              {!muted ? (
+                <StatusHeader
+                  status={status}
+                  friend={account}
+                  collapsed={isExpanded === false}
+                  parseClick={parseClick}
+                />
+              ) : null}
+            </span>
             <StatusIcons
               status={status}
               mediaIcon={mediaIcon}