Merge remote-tracking branch 'tootsuite/master'

Conflicts: app/controllers/statuses_controller.rb
2018-04-12 03:30:57 -05:00
parent eb72c3398c 8e88a18316
commit a817f084ea
14 changed files with 160 additions and 32 deletions
--- a/app/javascript/styles/mastodon/stream_entries.scss
+++ b/app/javascript/styles/mastodon/stream_entries.scss
@ -6,7 +6,8 @@
    background: $simple-background-color;

    .detailed-status.light,
-    .status.light {
+    .status.light,
+    .more.light {
      border-bottom: 1px solid $ui-secondary-color;
      animation: none;
    }
@ -290,6 +291,17 @@
      text-decoration: underline;
    }
  }
+
+  .more {
+    color: $classic-primary-color;
+    display: block;
+    padding: 14px;
+    text-align: center;
+
+    &:not(:hover) {
+      text-decoration: none;
+    }
+  }
 }

 .embed {