From 691107263c5e05973f9af9e1937abbc27430f54e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9lanie=20Chauvel=20=28ariasuni=29?= Date: Thu, 31 May 2018 15:16:31 +0200 Subject: [PATCH] Put the CW field between the toot we are replying to and the toot field (#7508) * Remove Collapsable and use CSS instead * Put the CW field between the toot we are replying to and the toot field * Use same spacing between all fields in the composing column --- .../mastodon/components/collapsable.js | 22 ------------------- .../compose/components/compose_form.js | 17 ++++++-------- .../styles/mastodon/components.scss | 17 ++++++++++++-- 3 files changed, 22 insertions(+), 34 deletions(-) delete mode 100644 app/javascript/mastodon/components/collapsable.js diff --git a/app/javascript/mastodon/components/collapsable.js b/app/javascript/mastodon/components/collapsable.js deleted file mode 100644 index d5d4311864..0000000000 --- a/app/javascript/mastodon/components/collapsable.js +++ /dev/null @@ -1,22 +0,0 @@ -import React from 'react'; -import Motion from '../features/ui/util/optional_motion'; -import spring from 'react-motion/lib/spring'; -import PropTypes from 'prop-types'; - -const Collapsable = ({ fullHeight, isVisible, children }) => ( - - {({ opacity, height }) => ( -
- {children} -
- )} -
-); - -Collapsable.propTypes = { - fullHeight: PropTypes.number.isRequired, - isVisible: PropTypes.bool.isRequired, - children: PropTypes.node.isRequired, -}; - -export default Collapsable; diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 6cc594c889..60485e3c61 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -7,7 +7,6 @@ import ReplyIndicatorContainer from '../containers/reply_indicator_container'; import AutosuggestTextarea from '../../../components/autosuggest_textarea'; import UploadButtonContainer from '../containers/upload_button_container'; import { defineMessages, injectIntl } from 'react-intl'; -import Collapsable from '../../../components/collapsable'; import SpoilerButtonContainer from '../containers/spoiler_button_container'; import PrivacyDropdownContainer from '../containers/privacy_dropdown_container'; import SensitiveButtonContainer from '../containers/sensitive_button_container'; @@ -160,17 +159,15 @@ export default class ComposeForm extends ImmutablePureComponent {
- -
- -
-
- +
+ +
+