From 7832425fdd71cb637cc138b88ddb506ac27665b7 Mon Sep 17 00:00:00 2001
From: Tomohiro Suwa <neoen.gsn@gmail.com>
Date: Thu, 20 Apr 2017 02:21:23 +0900
Subject: [PATCH] Fix css for toot button when uploading images (#2161)
---
app/assets/javascripts/components/components/button.jsx | 5 ++++-
.../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 c3e1840246..6c3da10fe1 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 fad77c8e9d..805aad3d52 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>
--
GitLab