From ad10a80a9925c247ef14837d3a14ff7e7375f001 Mon Sep 17 00:00:00 2001
From: kibigo! <marrus-sh@users.noreply.github.com>
Date: Fri, 5 Jan 2018 20:04:13 -0800
Subject: Styling and autosuggest fixes for #293

---
 .../glitch/styles/components/composer.scss         | 62 ++++++++++------------
 1 file changed, 27 insertions(+), 35 deletions(-)

(limited to 'app/javascript/flavours/glitch/styles/components/composer.scss')

diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss
index 46df79906..ab5fa4712 100644
--- a/app/javascript/flavours/glitch/styles/components/composer.scss
+++ b/app/javascript/flavours/glitch/styles/components/composer.scss
@@ -52,22 +52,7 @@
     margin-bottom: 5px;
     overflow: hidden;
 
-    & > .account {
-      & > .avatar {
-        float: left;
-        margin-right: 5px;
-      }
-
-      & > .display_name {
-        color: $ui-base-color;
-        display: block;
-        padding-right: 25px;
-        max-width: 100%;
-        line-height: 24px;
-        text-decoration: none;
-        overflow: hidden;
-      }
-    }
+    & > .account.small { color: $ui-base-color }
 
     & > .cancel {
       float: right;
@@ -87,34 +72,34 @@
     overflow: visible;
     white-space: pre-wrap;
     padding-top: 5px;
-  }
-
-  .emojione {
-    width: 20px;
-    height: 20px;
-    margin: -5px 0 0;
-  }
 
-  p {
-    margin-bottom: 20px;
+    p {
+      margin-bottom: 20px;
 
-    &:last-child { margin-bottom: 0 }
-  }
+      &:last-child { margin-bottom: 0 }
+    }
 
-  a {
-    color: lighten($ui-base-color, 20%);
-    text-decoration: none;
+    a {
+      color: lighten($ui-base-color, 20%);
+      text-decoration: none;
 
-    &:hover { text-decoration: underline }
+      &:hover { text-decoration: underline }
 
-    &.mention {
-      &:hover {
-        text-decoration: none;
+      &.mention {
+        &:hover {
+          text-decoration: none;
 
-        span { text-decoration: underline }
+          span { text-decoration: underline }
+        }
       }
     }
   }
+
+  .emojione {
+    width: 20px;
+    height: 20px;
+    margin: -5px 0 0;
+  }
 }
 
 .composer--textarea {
@@ -175,6 +160,7 @@
   padding: 10px;
   font-size: 14px;
   line-height: 18px;
+  overflow: hidden;
   cursor: pointer;
 
   &:hover,
@@ -191,6 +177,12 @@
       height: 18px;
     }
   }
+
+  & > .account.small {
+    .display-name {
+      & > span { color: lighten($ui-base-color, 36%) }
+    }
+  }
 }
 
 .composer--upload_form {
-- 
cgit