Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-13 23:17:15 +00:00
parent 10f800ab46 0d3ffa691e
commit e5a9831a56
2 changed files with 8 additions and 3 deletions
--- 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 {