about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2017-05-25 09:23:54 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-05-25 02:23:54 +0200
commit9f69aa3cb18799600d1ea4a7a38e160d9be9a5ab (patch)
tree5ea35acad83f394f5573015c0fc028339cb6bf4d /app
parentf5c3d20e9cbd2e57d48c6080691eb493be10c7fc (diff)
Prevent contents of the status placeholder from overflowing (#3287)
Since long lines may overflow and cause the status-list horizontally scrollable,
I added `overflow: hidden` to placeholder contents to prevent it.
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/components/status.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 549592c6b..a1f52226f 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -95,7 +95,7 @@ class Status extends ImmutablePureComponent {
 
     if (isIntersecting === false && isHidden) {
       return (
-        <div ref={this.handleRef} data-id={status.get('id')} style={{ height: `${this.height}px`, opacity: 0 }}>
+        <div ref={this.handleRef} data-id={status.get('id')} style={{ height: `${this.height}px`, opacity: 0, overflow: 'hidden' }}>
           {status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}
           {status.get('content')}
         </div>