about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2017-06-20 01:27:07 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-06-19 18:27:07 +0200
commitaa58cca040f332eefc6ef0e98752dd0f1a770c6e (patch)
tree90737651d2e02e29caa75bb2185dd3fa253ec56f /app/javascript
parent5cc7cd8518eea864ce29228a8c04a65f9cdbb87a (diff)
Set cursor:pointer only when necessary (#3857)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/components/status_content.js6
-rw-r--r--app/javascript/styles/components.scss6
2 files changed, 4 insertions, 8 deletions
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 89031b3dc..4e435b2c4 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -136,7 +136,7 @@ class StatusContent extends React.PureComponent {
       }
 
       return (
-        <div className='status__content' ref={this.setRef} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
+        <div className='status__content status__content--with_action' ref={this.setRef} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
           <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
             <span dangerouslySetInnerHTML={spoilerContent} />
             {' '}
@@ -152,7 +152,7 @@ class StatusContent extends React.PureComponent {
       return (
         <div
           ref={this.setRef}
-          className='status__content'
+          className='status__content status__content--with-action'
           style={directionStyle}
           onMouseDown={this.handleMouseDown}
           onMouseUp={this.handleMouseUp}
@@ -163,7 +163,7 @@ class StatusContent extends React.PureComponent {
       return (
         <div
           ref={this.setRef}
-          className='status__content status__content--no-action'
+          className='status__content'
           style={directionStyle}
           dangerouslySetInnerHTML={content}
         />
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 4b5802cee..1cd0eba74 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -436,14 +436,10 @@
   margin-right: 5px;
 }
 
-.status__content {
+.status__content--with-action {
   cursor: pointer;
 }
 
-.status__content--no-action {
-  cursor: default;
-}
-
 .status__content,
 .reply-indicator__content {
   font-size: 15px;