techhub/mastodon
2
0
Fork 0
Code Activity

Fancier drag & drop indicator, emoji icon for emoji, upload progress (fix #295)

Browse Source
This commit is contained in:
Eugen Rochko
2017-03-24 03:50:30 +01:00
parent 3e2d6ea408
commit d7c6c6dbe1
13 changed files with 244 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ const ColumnCollapsable = React.createClass({
return (
<div style={{ position: 'relative' }}>
<div style={{...iconStyle }} className={collapsedClassName} onClick={this.handleToggleCollapsed}><i className={`fa fa-${icon}`} /></div>
<div style={{...iconStyle }} className={`column-icon ${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 }) =>