Merge remote-tracking branch 'upstream/master'

2017-06-27 20:46:13 +00:00
parent e6300de142 da42bfadb5
commit ddafde942c
91 changed files with 1274 additions and 751 deletions
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -149,7 +149,7 @@ class StatusUnextended extends ImmutablePureComponent {

  saveHeight = () => {
    if (this.node && this.node.children.length !== 0) {
-      this.height = this.node.clientHeight;
+      this.height = this.node.getBoundingClientRect().height;
    }
  }