From 083170bec755920b80c64f9cca2cc419831f66c8 Mon Sep 17 00:00:00 2001 From: kibigo! Date: Fri, 29 Dec 2017 14:55:06 -0800 Subject: [PATCH] WIP Refactor; SCSS ed. --- .../flavours/glitch/actions/compose.js | 8 - .../flavours/glitch/components/avatar.js | 18 +- .../glitch/components/display_name.js | 12 +- .../glitch/features/composer/options/index.js | 7 +- .../features/composer/publisher/index.js | 3 +- .../glitch/features/composer/reply/index.js | 9 +- .../features/composer/textarea/index.js | 3 +- .../composer/textarea/suggestions/index.js | 8 +- .../textarea/suggestions/item/index.js | 4 +- .../composer/upload_form/item/index.js | 1 + .../drawer/{pager => }/account/index.js | 4 +- .../flavours/glitch/features/drawer/index.js | 33 +- .../glitch/features/drawer/pager/index.js | 43 -- .../ui/components/onboarding_modal.js | 8 +- .../flavours/glitch/reducers/compose.js | 3 - .../glitch/styles/components/compose.scss | 0 .../glitch/styles/components/composer.scss | 315 ++++++++ .../glitch/styles/components/drawer.scss | 234 ++++++ .../glitch/styles/components/index.scss | 695 +----------------- 19 files changed, 626 insertions(+), 782 deletions(-) rename app/javascript/flavours/glitch/features/drawer/{pager => }/account/index.js (92%) delete mode 100644 app/javascript/flavours/glitch/features/drawer/pager/index.js delete mode 100644 app/javascript/flavours/glitch/styles/components/compose.scss create mode 100644 app/javascript/flavours/glitch/styles/components/composer.scss diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js index d87786008c..31866d2233 100644 --- a/app/javascript/flavours/glitch/actions/compose.js +++ b/app/javascript/flavours/glitch/actions/compose.js @@ -38,7 +38,6 @@ export const COMPOSE_SPOILERNESS_CHANGE = 'COMPOSE_SPOILERNESS_CHANGE'; export const COMPOSE_SPOILER_TEXT_CHANGE = 'COMPOSE_SPOILER_TEXT_CHANGE'; export const COMPOSE_VISIBILITY_CHANGE = 'COMPOSE_VISIBILITY_CHANGE'; export const COMPOSE_LISTABILITY_CHANGE = 'COMPOSE_LISTABILITY_CHANGE'; -export const COMPOSE_COMPOSING_CHANGE = 'COMPOSE_COMPOSING_CHANGE'; export const COMPOSE_EMOJI_INSERT = 'COMPOSE_EMOJI_INSERT'; @@ -382,10 +381,3 @@ export function insertEmojiCompose(position, emoji) { emoji, }; }; - -export function changeComposing(value) { - return { - type: COMPOSE_COMPOSING_CHANGE, - value, - }; -} diff --git a/app/javascript/flavours/glitch/components/avatar.js b/app/javascript/flavours/glitch/components/avatar.js index 82ab0f45a0..c5e9072c4a 100644 --- a/app/javascript/flavours/glitch/components/avatar.js +++ b/app/javascript/flavours/glitch/components/avatar.js @@ -1,3 +1,4 @@ +import classNames from 'classnames'; import React from 'react'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; @@ -7,6 +8,7 @@ export default class Avatar extends React.PureComponent { static propTypes = { account: ImmutablePropTypes.map.isRequired, + className: PropTypes.string, size: PropTypes.number.isRequired, style: PropTypes.object, inline: PropTypes.bool, @@ -34,17 +36,19 @@ export default class Avatar extends React.PureComponent { } render () { - const { account, size, animate, inline } = this.props; + const { + account, + animate, + className, + inline, + size, + } = this.props; const { hovering } = this.state; const src = account.get('avatar'); const staticSrc = account.get('avatar_static'); - let className = 'account__avatar'; - - if (inline) { - className = className + ' account__avatar-inline'; - } + const computedClass = classNames('account__avatar', { 'account__avatar-inline': inline }, className); const style = { ...this.props.style, @@ -61,7 +65,7 @@ export default class Avatar extends React.PureComponent { return (
+ @{this.props.account.get('acct')} ); diff --git a/app/javascript/flavours/glitch/features/composer/options/index.js b/app/javascript/flavours/glitch/features/composer/options/index.js index ee633e8654..ea998a4219 100644 --- a/app/javascript/flavours/glitch/features/composer/options/index.js +++ b/app/javascript/flavours/glitch/features/composer/options/index.js @@ -236,7 +236,12 @@ export default class ComposerOptions extends React.PureComponent { }} > {({ scale }) => ( -
+
{diff} {sideArm && sideArm !== 'none' ? (