From d93b82af87de90eaa29eb54a423722fb9fb45b38 Mon Sep 17 00:00:00 2001 From: Takeshi Umeda Date: Sun, 2 Jun 2019 17:05:54 +0900 Subject: [PATCH] Improvement variable height in single column layout (#10917) * Improvement variable height of compose and navigation panel in single column layout * Fix wrong quotes and missing commas --- .../components/autosuggest_textarea.js | 54 ++++++++++--------- .../compose/components/compose_form.js | 40 +++++++------- .../features/ui/components/compose_panel.js | 3 -- .../styles/mastodon/components.scss | 54 +++++++++++++++---- 4 files changed, 94 insertions(+), 57 deletions(-) diff --git a/app/javascript/mastodon/components/autosuggest_textarea.js b/app/javascript/mastodon/components/autosuggest_textarea.js index f3fb7fa8b..5cad43e82 100644 --- a/app/javascript/mastodon/components/autosuggest_textarea.js +++ b/app/javascript/mastodon/components/autosuggest_textarea.js @@ -189,7 +189,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent { } render () { - const { value, suggestions, disabled, placeholder, onKeyUp, autoFocus } = this.props; + const { value, suggestions, disabled, placeholder, onKeyUp, autoFocus, children } = this.props; const { suggestionsHidden } = this.state; const style = { direction: 'ltr' }; @@ -197,34 +197,38 @@ export default class AutosuggestTextarea extends ImmutablePureComponent { style.direction = 'rtl'; } - return ( -
-