techhub/mastodon
2
0
Fork 0
Code Activity

Move more inline colours to scss

Browse Source
This commit is contained in:
Lorenz Diener
2017-02-10 15:35:19 +00:00
parent c424df5192
commit c9f42a7b85
6 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/components/components/column_collapsable.jsx
View File

@@ -40,10 +40,11 @@ const ColumnCollapsable = React.createClass({
render () {
const { icon, fullHeight, children } = this.props;
const { collapsed } = this.state;
const collapsedClassName = collapsed ? 'collapsable-collapsed' : 'collapsable';
return (
<div style={{ position: 'relative' }}>
<div style={{...iconStyle, color: collapsed ? '#9baec8' : '#fff', background: collapsed ? '#2f3441' : '#373b4a' }} onClick={this.handleToggleCollapsed}><i className={`fa fa-${icon}`} /></div>
<div style={{...iconStyle }} className={collapsedClassName} onClick={this.handleToggleCollapsed}><i className={`fa fa-${icon}`} /></div>
<Motion defaultStyle={{ opacity: 0, height: 0 }} style={{ opacity: spring(collapsed ? 0 : 100), height: spring(collapsed ? 0 : fullHeight, collapsed ? undefined : { stiffness: 150, damping: 9 }) }}>
{({ opacity, height }) =>