From c68c1466ac97ae1ef772c6168264d21b0001e802 Mon Sep 17 00:00:00 2001
From: Ash Levy <ashlea@protonmail.com>
Date: Sun, 18 Mar 2018 13:42:28 -0400
Subject: [PATCH 1/2] fix compressed notifications again (#393)

---
 .../flavours/glitch/components/status.js      | 34 ++++++++++---------
 .../glitch/styles/components/status.scss      |  6 ++--
 2 files changed, 20 insertions(+), 20 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}
diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index 5cce50589..6e4241130 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -294,17 +294,15 @@
 }
 
 .status__info {
-  position: relative;
+  display: flex;
   padding: 2px 0 5px;
   font-size: 15px;
   line-height: 24px;
 }
 
 .status__info__icons {
-  position: absolute;
+  margin-left: auto;
   color: lighten($ui-base-color, 26%);
-  top: 0;
-  right: 0;
 
   .status__visibility-icon {
     padding-left: 6px;

From 5b00b8f0da5b54fc5d92cec19cbd54c0a10255d6 Mon Sep 17 00:00:00 2001
From: Ash Lea <ashkitten@users.noreply.github.com>
Date: Sun, 18 Mar 2018 23:49:30 -0400
Subject: [PATCH 2/2] fix .status__info__icons layout

---
 .../flavours/glitch/styles/components/status.scss          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index 6e4241130..1c5e294f9 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -290,7 +290,6 @@
 .status__info__account .status__display-name {
   display: block;
   max-width: 100%;
-  padding-right: 25px;
 }
 
 .status__info {
@@ -298,10 +297,16 @@
   padding: 2px 0 5px;
   font-size: 15px;
   line-height: 24px;
+
+  > span {
+    overflow: hidden;
+  }
 }
 
 .status__info__icons {
   margin-left: auto;
+  display: flex;
+  align-items: baseline;
   color: lighten($ui-base-color, 26%);
 
   .status__visibility-icon {