about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-04-12 03:30:57 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-04-12 03:30:57 -0500
commita817f084eafaf5527445c29ab1d68f42b1a2872f (patch)
treef146e6c8ff958d60804e33e40e1970784f5b7b90 /app/javascript/styles
parenteb72c3398cd70c6b595fae5a0cb6730a3e49bd61 (diff)
parent8e88a18316d45a459a31d67487bccc247592d187 (diff)
Merge remote-tracking branch 'tootsuite/master'
  Conflicts:
 	app/controllers/statuses_controller.rb
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/mastodon/stream_entries.scss14
1 files changed, 13 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss
index 442b143a0..dfdc48d06 100644
--- 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 {