diff options
| author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-26 03:07:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 03:07:02 -0700 |
| commit | 589837cfc71c8676d03f31358f31c41b9c59a95d (patch) | |
| tree | f2aadc504520d308f80e003a434fbb9200afc0c7 | |
| parent | ebe5095665ec1c55e4888091223a974863198c37 (diff) | |
Removed line break before spoiler link, changed color of bg for spoiler link
| -rw-r--r-- | app/assets/javascripts/components/components/status_content.jsx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx index 619d8e2a6..ded98c1cd 100644 --- a/app/assets/javascripts/components/components/status_content.jsx +++ b/app/assets/javascripts/components/components/status_content.jsx @@ -87,7 +87,7 @@ const StatusContent = React.createClass({ const content = { __html: emojify(status.get('content')) }; const spoilerContent = { __html: emojify(status.get('spoiler_text', '')) }; const spoilerStyle = { - backgroundColor: '#fff', + backgroundColor: '#616b86', borderRadius: '4px', color: '#363c4b', fontWeight: '500', @@ -103,8 +103,7 @@ const StatusContent = React.createClass({ return ( <div className='status__content' style={{ cursor: 'pointer' }} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}> <p style={{ marginBottom: hidden ? '0px' : '' }} > - <span dangerouslySetInnerHTML={spoilerContent} /> - <a style={spoilerStyle} onClick={this.handleSpoilerClick}>[{toggleText}]</a> + <span dangerouslySetInnerHTML={spoilerContent} /> <a style={spoilerStyle} onClick={this.handleSpoilerClick}>[{toggleText}]</a> </p> <div style={{ display: hidden ? 'none' : 'block' }} dangerouslySetInnerHTML={content} /> |