nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix css for toot button when uploading images (#2161)

This commit is contained in:
Tomohiro Suwa 2017-04-20 02:21:23 +09:00 committed by Eugen
parent abe16a7026
commit 7832425fdd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,10 @@ const Button = React.createClass({
cursor: 'pointer', cursor: 'pointer',
lineHeight: `${this.props.size}px`, lineHeight: `${this.props.size}px`,
borderRadius: '4px', borderRadius: '4px',
textDecoration: 'none' textDecoration: 'none',
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
overflow: 'hidden'
}; };
return ( return (

4
app/assets/javascripts/components/features/compose/components/compose_form.jsx
View File

@ -197,9 +197,9 @@ const ComposeForm = React.createClass({
<SpoilerButtonContainer /> <SpoilerButtonContainer />
</div> </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', 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> </div>
</div> </div>