From 7cdb8c10e97fe9e22411efef4986e6393247e0ee Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Thu, 7 Nov 2019 08:06:06 +0100
Subject: [PATCH] Minor improvements to poll composing UI (#12319)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- Disable the “add option” button instead of hiding it
- Allow poll option inputs to scale to full width
---
.../mastodon/features/compose/components/poll_form.js | 4 +---
app/javascript/styles/mastodon/components.scss | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.js b/app/javascript/mastodon/features/compose/components/poll_form.js
index 211601d520..898f956b0c 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@@ -142,9 +142,7 @@ class PollForm extends ImmutablePureComponent {
</ul>
<div className='poll__footer'>
- {options.size < 4 && (
- <button className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
- )}
+ <button disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
<select value={expiresIn} onChange={this.handleSelectDuration}>
<option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 417e8c8990..ded668aea5 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -392,6 +392,7 @@
.autosuggest-input,
.spoiler-input {
position: relative;
+ width: 100%;
}
.spoiler-input {
--
GitLab