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

2017-11-27 05:17:11 +00:00
parent 86f4f8e158 0ea4478b68
commit 5de42665d7
15 changed files with 321 additions and 119 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2182,15 +2182,12 @@ button.icon-button.active i.fa-retweet {
 }

 .status-card-photo {
+  cursor: zoom-in;
  display: block;
  text-decoration: none;
-
-  img {
-    display: block;
-    width: 100%;
-    height: auto;
-    margin: 0;
-  }
+  width: 100%;
+  height: auto;
+  margin: 0;
 }

 .status-card-video {