diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js index 93e923c54..8466d8069 100644 --- a/app/soapbox/actions/compose.js +++ b/app/soapbox/actions/compose.js @@ -497,7 +497,7 @@ export function changeComposeSpoilerness() { }; }; -export function changeComposeMarkdown(value) { +export function changeComposeContentType(value) { return { type: COMPOSE_TYPE_CHANGE, value, diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js index dde769ac5..af8ce4263 100644 --- a/app/soapbox/features/compose/components/compose_form.js +++ b/app/soapbox/features/compose/components/compose_form.js @@ -49,7 +49,6 @@ class ComposeForm extends ImmutablePureComponent { text: PropTypes.string.isRequired, suggestions: ImmutablePropTypes.list, spoiler: PropTypes.bool, - content_type: PropTypes.string, privacy: PropTypes.string, spoilerText: PropTypes.string, focusDate: PropTypes.instanceOf(Date), diff --git a/app/soapbox/features/compose/containers/compose_form_container.js b/app/soapbox/features/compose/containers/compose_form_container.js index 99189385d..0a7cefc96 100644 --- a/app/soapbox/features/compose/containers/compose_form_container.js +++ b/app/soapbox/features/compose/containers/compose_form_container.js @@ -16,7 +16,6 @@ const mapStateToProps = state => ({ suggestions: state.getIn(['compose', 'suggestions']), spoiler: state.getIn(['compose', 'spoiler']), spoilerText: state.getIn(['compose', 'spoiler_text']), - content_type: state.getIn(['compose', 'text/markdown']), privacy: state.getIn(['compose', 'privacy']), focusDate: state.getIn(['compose', 'focusDate']), caretPosition: state.getIn(['compose', 'caretPosition']), diff --git a/app/soapbox/features/compose/containers/markdown_button_container.js b/app/soapbox/features/compose/containers/markdown_button_container.js index 1fd809966..0b4a642ca 100644 --- a/app/soapbox/features/compose/containers/markdown_button_container.js +++ b/app/soapbox/features/compose/containers/markdown_button_container.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux'; import TextIconButton from '../components/text_icon_button'; -import { changeComposeMarkdown } from '../../../actions/compose'; +import { changeComposeContentType } from '../../../actions/compose'; import { injectIntl, defineMessages } from 'react-intl'; const messages = defineMessages({ @@ -18,7 +18,7 @@ const mapStateToProps = (state, { intl }) => ({ const mapDispatchToProps = dispatch => ({ onClick() { - dispatch(changeComposeMarkdown(this.active ? 'text/plain' : 'text/markdown')); + dispatch(changeComposeContentType(this.active ? 'text/plain' : 'text/markdown')); }, }); diff --git a/app/soapbox/reducers/compose.js b/app/soapbox/reducers/compose.js index c8294edec..60418da85 100644 --- a/app/soapbox/reducers/compose.js +++ b/app/soapbox/reducers/compose.js @@ -214,8 +214,7 @@ export default function compose(state = initialState, action) { .set('is_composing', false); case COMPOSE_SENSITIVITY_CHANGE: return state.withMutations(map => { - map.set('sensitive', !state.get('sensitive')); - + map.set('sensitive', !state.get('sensitive')); map.set('idempotencyKey', uuid()); }); case COMPOSE_TYPE_CHANGE: diff --git a/app/styles/components/status.scss b/app/styles/components/status.scss index 526f59cb0..7137874de 100644 --- a/app/styles/components/status.scss +++ b/app/styles/components/status.scss @@ -1,17 +1,21 @@ .status__content { - p, li { + p, + li { strong { font-weight: bold; } } - p, li { + p, + li { em { font-style: italic; } } - ul, ol, blockquote { + ul, + ol, + blockquote { margin-bottom: 20px; margin-left: 15px; }