zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Merge pull request #524 from blackle/master 

fix up spoilers
This commit is contained in:
Eugen 2017-01-25 02:16:36 +01:00 committed by GitHub
parent 10ffd455a8 ca13ec04a8
commit 41f5459af5
2 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/components/status_content.jsx
View File

@ -92,7 +92,7 @@ const StatusContent = React.createClass({
return (
<div className='status__content' style={{ cursor: 'pointer' }} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
<p>
<p style={{ marginBottom: hidden ? '0px' : '' }} >
<span dangerouslySetInnerHTML={spoilerContent} /> <a onClick={this.handleSpoilerClick}>{toggleText}</a>
</p>

34
app/assets/stylesheets/components.scss
View File

@ -679,42 +679,8 @@
}
}
.spoiler-helper {
margin-bottom: -20px !important;
}
.spoiler {
&::before {
margin-top: 20px;
display: block;
content: '';
}
display: inline;
cursor: pointer;
border-bottom: 1px dashed white;
.light & {
border-bottom: 1px dashed black;
}
&.spoiler-on {
&, & * {
color: transparent !important;
}
background: white;
.light & {
background: black;
}
.emojione {
opacity: 0;
}
}
}
@import 'boost';
button i.fa-retweet {
height: 19px;
width: 22px;