Skip to content

Commit

Permalink
Fix css for toot button when uploading images (mastodon#2161)
Browse files Browse the repository at this point in the history
  • Loading branch information
tsuwatch authored and Gargron committed Apr 19, 2017
1 parent abe16a7 commit 7832425
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion app/assets/javascripts/components/components/button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ const Button = React.createClass({
cursor: 'pointer',
lineHeight: `${this.props.size}px`,
borderRadius: '4px',
textDecoration: 'none'
textDecoration: 'none',
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
overflow: 'hidden'
};

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,9 @@ const ComposeForm = React.createClass({
<SpoilerButtonContainer />
</div>

<div style={{ display: 'flex' }}>
<div style={{ display: 'flex', minWidth: 0 }}>
<div style={{ paddingTop: '10px', marginRight: '16px', lineHeight: '36px' }}><CharacterCounter max={500} text={text} /></div>
<div style={{ paddingTop: '10px' }}><Button text={publishText} onClick={this.handleSubmit} disabled={disabled || text.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "_").length > 500} /></div>
<div style={{ paddingTop: '10px', overflow: 'hidden' }}><Button text={publishText} onClick={this.handleSubmit} disabled={disabled || text.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "_").length > 500} block /></div>
</div>
</div>
</div>
Expand Down

0 comments on commit 7832425

Please sign in to comment.