about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-12-13 23:17:15 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-12-13 23:17:15 +0000
commite5a9831a56e7fdc0a767f0d8a059bebeabeed22f (patch)
tree14d6843074ebf34040d7a01963631bced63763a8 /app/javascript/styles
parent10f800ab46f992294907150177bdbf3e8265c915 (diff)
parent0d3ffa691ebef1b7874b5369829b7c3e2b006940 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/mastodon/components.scss7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index be28473e5..cf15def68 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -606,6 +606,7 @@
   font-weight: 400;
   overflow: hidden;
   white-space: pre-wrap;
+  padding-top: 2px;
 
   &:focus {
     outline: 0;
@@ -704,6 +705,10 @@
 
     .status.status-direct {
       background: lighten($ui-base-color, 12%);
+
+      &.muted {
+        background: transparent;
+      }
     }
 
     .detailed-status,
@@ -858,7 +863,7 @@
 .status__action-bar {
   align-items: center;
   display: flex;
-  margin-top: 10px;
+  margin-top: 8px;
 }
 
 .status__action-bar-button {