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

Disables CW [Show More/Less] links in collapsed toots

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
kibigo! 2017-06-25 15:25:19 -07:00
parent 6909bbdc9e
commit d6e3918d92
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -504,15 +504,6 @@
} }
} }
.status__content__spoiler-link {
background: lighten($ui-base-color, 30%);
&:hover {
background: lighten($ui-base-color, 33%);
text-decoration: none;
}
}
.status__content__text { .status__content__text {
display: none; display: none;
@ -525,15 +516,27 @@
.status__content__spoiler-link { .status__content__spoiler-link {
display: inline-block; display: inline-block;
border-radius: 2px; border-radius: 2px;
background: transparent; background: lighten($ui-base-color, 30%);
border: 0; border: 1px lighten($ui-base-color, 30%) solid;
color: lighten($ui-base-color, 8%); color: lighten($ui-base-color, 8%);
font-weight: 500; font-weight: 500;
font-size: 11px; font-size: 11px;
padding: 0 6px; padding: 0 5px;
text-transform: uppercase; text-transform: uppercase;
line-height: inherit; line-height: 18px;
cursor: pointer; cursor: pointer;
transition: background-color .3s, color .3s;
&:hover {
background: lighten($ui-base-color, 33%);
text-decoration: none;
}
.status-collapsed &, .status-collapsed &:hover {
background: transparent;
color: lighten($ui-base-color, 30%);
vertical-align: bottom;
}
} }
.status__prepend-icon-wrapper { .status__prepend-icon-wrapper {