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

Minor collapsing button improvements~

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
kibigo! 2017-06-21 19:54:41 -07:00 committed by beatrix-bitrot
parent 93c52301ad
commit 4bd7482a7a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ export default class IconButton extends React.PureComponent {
} }
return ( return (
<Motion defaultStyle={{ rotate: this.props.active ? (this.props.flip ? -180 : -360) : 0 }} style={{ rotate: this.props.animate ? spring(this.props.active ? (this.props.flip ? -180 : -360) : 0, { stiffness: 120, damping: 7 }) : 0 }}> <Motion defaultStyle={{ rotate: this.props.active ? (this.props.flip ? -180 : -360) : 0 }} style={{ rotate: this.props.animate ? spring(this.props.active ? (this.props.flip ? -180 : -360) : 0, { stiffness: this.props.flip ? 60 : 120, damping: 7 }) : 0 }}>
{({ rotate }) => {({ rotate }) =>
<button <button
aria-label={this.props.title} aria-label={this.props.title}

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

@ -238,7 +238,7 @@ export default class Status extends ImmutablePureComponent {
animate flip animate flip
active={isCollapsed} active={isCollapsed}
title={isCollapsed ? intl.formatMessage(messages.uncollapse) : intl.formatMessage(messages.collapse)} title={isCollapsed ? intl.formatMessage(messages.uncollapse) : intl.formatMessage(messages.collapse)}
icon='angle-double-down' icon='angle-double-up'
onClick={this.handleCollapsedClick} onClick={this.handleCollapsedClick}
/> />