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

Auto-uncollapse when expanding CW

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
kibigo! 2017-06-25 15:52:55 -07:00
parent b1f9892e63
commit 6a50e73089
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/components/status.js
View File

@ -166,11 +166,11 @@ class StatusUnextended extends ImmutablePureComponent {
} }
handleExpandedToggle = () => { handleExpandedToggle = () => {
if (!this.state.isCollapsed) this.setState({ isExpanded: !this.state.isExpanded }); this.setState({ isExpanded: !this.state.isExpanded, isCollapsed: false });
}; };
handleCollapsedClick = () => { handleCollapsedClick = () => {
this.setState({ isCollapsed: !this.state.isCollapsed }); this.setState({ isCollapsed: !this.state.isCollapsed, isExpanded: false });
} }
render () { render () {

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

@ -525,16 +525,13 @@
text-transform: uppercase; text-transform: uppercase;
line-height: 18px; line-height: 18px;
cursor: pointer; cursor: pointer;
transition: background-color .3s, color .3s;
&:hover { &:hover {
background: lighten($ui-base-color, 33%); background: lighten($ui-base-color, 33%);
text-decoration: none; text-decoration: none;
} }
.status-collapsed &, .status-collapsed &:hover { .status-collapsed & {
background: transparent;
color: lighten($ui-base-color, 30%);
vertical-align: bottom; vertical-align: bottom;
} }
} }