treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Set cursor:pointer only when necessary (#3857)

lolsob-rspec
unarist 2017-06-20 01:27:07 +09:00 committed by Eugen Rochko
parent 8b65b64428
commit 8db07d1187
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 (
<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}
/>

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

@ -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;