Merge pull request #848 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 6 insertions, 1 deletions

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index fc55163bc..6f3f57265 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1489,6 +1489,7 @@ a.account__display-name {
   cursor: default;
   color: $darker-text-color;
   font-size: 15px;
+  line-height: 22px;
   position: relative;
 
   .fa {
@@ -1496,7 +1497,7 @@ a.account__display-name {
   }
 
   > span {
-    display: block;
+    display: inline;
     overflow: hidden;
     text-overflow: ellipsis;
   }
@@ -1526,6 +1527,10 @@ a.account__display-name {
   }
 }
 
+.notification__relative_time {
+  float: right;
+}
+
 .display-name {
   display: block;
   max-width: 100%;