hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set cursor:pointer only when necessary (#3857)

signup-info-prompt
unarist 2017-06-20 01:27:07 +09:00 committed by Eugen Rochko
parent 5cc7cd8518
commit aa58cca040
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/mastodon/components/status_content.js
View File

@ -136,7 +136,7 @@ class StatusContent extends React.PureComponent {
} }
return ( 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 }}> <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
<span dangerouslySetInnerHTML={spoilerContent} /> <span dangerouslySetInnerHTML={spoilerContent} />
{' '} {' '}
@ -152,7 +152,7 @@ class StatusContent extends React.PureComponent {
return ( return (
<div <div
ref={this.setRef} ref={this.setRef}
className='status__content' className='status__content status__content--with-action'
style={directionStyle} style={directionStyle}
onMouseDown={this.handleMouseDown} onMouseDown={this.handleMouseDown}
onMouseUp={this.handleMouseUp} onMouseUp={this.handleMouseUp}
@ -163,7 +163,7 @@ class StatusContent extends React.PureComponent {
return ( return (
<div <div
ref={this.setRef} ref={this.setRef}
className='status__content status__content--no-action' className='status__content'
style={directionStyle} style={directionStyle}
dangerouslySetInnerHTML={content} dangerouslySetInnerHTML={content}
/> />

6
app/javascript/styles/components.scss
View File

@ -436,14 +436,10 @@
margin-right: 5px; margin-right: 5px;
} }
.status__content { .status__content--with-action {
cursor: pointer; cursor: pointer;
} }
.status__content--no-action {
cursor: default;
}
.status__content, .status__content,
.reply-indicator__content { .reply-indicator__content {
font-size: 15px; font-size: 15px;