From f31530b74d0f2ab77845db26babc25f5de337bd4 Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Fri, 27 Sep 2019 09:14:49 +0900
Subject: Fix overflow on conversations (#11965)

* Fix: overflow on conversations

* Fix: overflow on conversations
---
 app/javascript/styles/mastodon/components.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app/javascript/styles')

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index f4f26203e..7562cc709 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6418,13 +6418,17 @@ noscript {
     flex: 1 1 auto;
     padding: 10px 5px;
     padding-right: 15px;
+    word-break: break-all;
+    overflow: hidden;
 
     &__info {
       overflow: hidden;
+      display: flex;
+      flex-direction: row-reverse;
+      justify-content: space-between;
     }
 
     &__relative-time {
-      float: right;
       font-size: 15px;
       color: $darker-text-color;
       padding-left: 15px;
@@ -6437,6 +6441,8 @@ noscript {
       overflow: hidden;
       text-overflow: ellipsis;
       margin-bottom: 4px;
+      flex-basis: 170px;
+      flex-shrink: 1000;
 
       a {
         color: $primary-text-color;
-- 
cgit