about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorkibigo! <marrus-sh@users.noreply.github.com>2017-06-21 19:05:24 -0700
committerbeatrix-bitrot <beatrix.bitrot@gmail.com>2017-06-23 21:50:45 +0000
commit93c52301ade71fb685d937b90451974d03d710af (patch)
treec3983a73b532cedc00e08a716dbb0aad2605dbd5 /app/javascript/styles
parent0d3ec19e89b7a3b6e01f2018640c713dd545ae21 (diff)
Collapsable toots [1/??] ☕️
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/components.scss18
1 files changed, 17 insertions, 1 deletions
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 10ce06940..4ae371c44 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -459,6 +459,7 @@
   word-wrap: break-word;
   font-weight: 400;
   overflow: hidden;
+  text-overflow: ellipsis;
   white-space: pre-wrap;
 
   .emojione {
@@ -542,8 +543,10 @@
   padding: 8px 10px;
   padding-left: 68px;
   position: relative;
+  height: auto;
   min-height: 48px;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
+  overflow: hidden;
   cursor: default;
 
   @keyframes fade {
@@ -598,6 +601,14 @@
       }
     }
   }
+
+  &.status-collapsed {
+    height: 48px;
+
+    .status__content {
+      height: 20px;
+    }
+  }
 }
 
 .notification-favourite {
@@ -611,8 +622,8 @@
 }
 
 .status__relative-time {
+  margin-left: auto;
   color: lighten($ui-base-color, 26%);
-  float: right;
   font-size: 14px;
 }
 
@@ -628,6 +639,11 @@
 
 .status__info {
   font-size: 15px;
+  line-height: 28px;
+}
+
+.status__collapse-button {
+  float: right;
 }
 
 .status-check-box {