From 31d760f56d0b22e5daf3becf901b038f8d02645a Mon Sep 17 00:00:00 2001
From: Spencer Alves <impiaaa@gmail.com>
Date: Mon, 7 May 2018 22:10:34 -0700
Subject: [PATCH 1/2] Add an extra icon to indicate that a status is part of a
 conversation

---
 app/javascript/flavours/glitch/components/status_icons.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/javascript/flavours/glitch/components/status_icons.js b/app/javascript/flavours/glitch/components/status_icons.js
index e354c45e41..86d1ca05b7 100644
--- a/app/javascript/flavours/glitch/components/status_icons.js
+++ b/app/javascript/flavours/glitch/components/status_icons.js
@@ -47,6 +47,12 @@ 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`}
+            aria-hidden='true'
+          />
+        ) : null}
         {mediaIcon ? (
           <i
             className={`fa fa-fw fa-${mediaIcon}`}

From 559ce5c098f04203b173da562fceddd8b262b484 Mon Sep 17 00:00:00 2001
From: Spencer Alves <impiaaa@gmail.com>
Date: Thu, 31 May 2018 21:55:44 -0700
Subject: [PATCH 2/2] Adjust spacing between status icons

---
 app/javascript/flavours/glitch/components/status_icons.js  | 4 ++--
 .../flavours/glitch/styles/components/status.scss          | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/status_icons.js b/app/javascript/flavours/glitch/components/status_icons.js
index 86d1ca05b7..c9747650f2 100644
--- a/app/javascript/flavours/glitch/components/status_icons.js
+++ b/app/javascript/flavours/glitch/components/status_icons.js
@@ -49,13 +49,13 @@ export default class StatusIcons extends React.PureComponent {
       <div className='status__info__icons'>
         {status.get('in_reply_to_id', null) !== null ? (
           <i
-            className={`fa fa-fw fa-comment`}
+            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 733845c5f8..2b31e2dcb5 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;
   }
 }