diff options
| author | Tomohiro Suwa <neoen.gsn@gmail.com> | 2017-04-20 02:21:23 +0900 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-19 19:21:23 +0200 |
| commit | 7832425fdd71cb637cc138b88ddb506ac27665b7 (patch) | |
| tree | c04a5c23f1552a4fe9fef2da441b2467e78484d5 /app/assets/javascripts | |
| parent | abe16a7026d5d2087c08138f0fe7d0c6776d896e (diff) | |
Fix css for toot button when uploading images (#2161)
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/components/components/button.jsx | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/components/features/compose/components/compose_form.jsx | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/components/button.jsx b/app/assets/javascripts/components/components/button.jsx index c3e184024..6c3da10fe 100644 --- a/app/assets/javascripts/components/components/button.jsx +++ b/app/assets/javascripts/components/components/button.jsx @@ -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 ( diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx index fad77c8e9..805aad3d5 100644 --- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx +++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx @@ -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> |