Merge remote-tracking branch 'origin/master' into gs-master

2017-10-22 22:57:41 -05:00
parent d589dd7cd0 fdb0848e08
commit 4f01e6e8d5
6 changed files with 12 additions and 29 deletions
--- a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
@@ -47,7 +47,7 @@ class SensitiveButton extends React.PureComponent {
            'compose-form__sensitive-button--visible': visible,
          });
          return (
-            <div className={className} style={{ transform: `translateZ(0) scale(${scale})` }}>
+            <div className={className} style={{ transform: `scale(${scale})` }}>
              <IconButton
                className='compose-form__sensitive-button__icon'
                title={intl.formatMessage(messages.title)}