about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-06-01 00:35:13 -0500
committerGitHub <noreply@github.com>2018-06-01 00:35:13 -0500
commit0aba716fe1596376443cfe793fa8915e66931622 (patch)
tree790cd7d374b5ecd4ace56293f9d5394268f4222d /app/javascript/flavours/glitch
parente396fbfe3bf4d2a404e78e73cff1a609dd0a9bfb (diff)
parente5f25a73f21998188f8cc15584134744ff7e15b3 (diff)
Merge pull request #471 from impiaaa/thread-icon
Add an extra icon to indicate that a status is part of a conversation
Diffstat (limited to 'app/javascript/flavours/glitch')
-rw-r--r--app/javascript/flavours/glitch/components/status_icons.js8
-rw-r--r--app/javascript/flavours/glitch/styles/components/status.scss7
2 files changed, 13 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/components/status_icons.js b/app/javascript/flavours/glitch/components/status_icons.js
index e354c45e4..c9747650f 100644
--- a/app/javascript/flavours/glitch/components/status_icons.js
+++ b/app/javascript/flavours/glitch/components/status_icons.js
@@ -47,9 +47,15 @@ export default class StatusIcons extends React.PureComponent {
 
     return (
       <div className='status__info__icons'>
+        {status.get('in_reply_to_id', null) !== null ? (
+          <i
+            className={`fa fa-fw fa-comment status__reply-icon`}
+            aria-hidden='true'
+          />
+        ) : null}
         {mediaIcon ? (
           <i
-            className={`fa fa-fw fa-${mediaIcon}`}
+            className={`fa fa-fw fa-${mediaIcon} status__media-icon`}
             aria-hidden='true'
           />
         ) : null}
diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index 733845c5f..2b31e2dcb 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -331,8 +331,13 @@
   height: 1em;
   color: $action-button-color;
 
-  .status__visibility-icon {
+  .status__media-icon {
     padding-left: 6px;
+    padding-right: 1px;
+  }
+
+  .status__visibility-icon {
+    padding-left: 4px;
   }
 }