Merge branch 'master' into glitch-soc/merge-upstream

2019-05-15 17:11:40 +02:00
parent cd534830ad f4f22391b2
commit 6badf2d252
39 changed files with 271 additions and 155 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1412,6 +1412,15 @@ a.account__display-name {
  width: 48px;
 }

+.status__expand {
+  width: 68px;
+  position: absolute;
+  left: 0;
+  top: 0;
+  height: 100%;
+  cursor: pointer;
+}
+
 .muted {
  .status__content p,
  .status__content a {