fixup! th: quotes

Remove quote-indicator stuff since reply-indicator how handles quotes.

app/javascript/flavours/glitch/features/compose/components/compose_form.jsx

@@ -257,7 +257,6 @@ class ComposeForm extends ImmutablePureComponent {
     return (
       <form className='compose-form' onSubmit={this.handleSubmit}>
         <ReplyIndicator />
-        {/* <QuoteIndicatorContainer /> */}
         {!withoutNavigation && <NavigationBar />}
         <WarningContainer />
 

app/javascript/flavours/glitch/features/compose/components/quote_indicator.jsx

@@ -1,85 +0,0 @@
-//  Package imports.
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import AttachmentList from 'flavours/glitch/components/attachment_list';
-import { WithOptionalRouterPropTypes, withOptionalRouter } from 'flavours/glitch/utils/react_router';
-
-import { Avatar } from '../../../components/avatar';
-import { DisplayName } from '../../../components/display_name';
-import { Icon } from '../../../components/icon';
-import { IconButton } from '../../../components/icon_button';
-
-//  Messages.
-const messages = defineMessages({
-  cancel: {
-    defaultMessage: 'Cancel',
-    id: 'quote_indicator.cancel',
-  },
-});
-
-class QuoteIndicator extends ImmutablePureComponent {
-
-  static propTypes = {
-    status: ImmutablePropTypes.map,
-    onCancel: PropTypes.func,
-    intl: PropTypes.object.isRequired,
-    ...WithOptionalRouterPropTypes,
-  };
-
-  handleClick = () => {
-    this.props.onCancel();
-  };
-
-  handleAccountClick = (e) => {
-    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      this.props.history?.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
-    }
-  }
-
-  //  Rendering.
-  render () {
-    const { status, intl } = this.props;
-
-    if (!status) {
-      return null;
-    }
-
-    const content = { __html: status.get('contentHtml') };
-
-    //  The result.
-    return (
-      <article className='quote-indicator'>
-        <header className='quote-indicator__header'>
-          <div className='quote-indicator__cancel'>
-            <IconButton title={intl.formatMessage(messages.cancel)} icon='times' iconComponent={CloseIcon} onClick={this.handleClick} inverted />
-          </div>
-
-          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='quote-indicator__display-name' target='_blank' rel='noopener noreferrer'>
-            <div className='quote-indicator__display-avatar'><Avatar account={status.get('account')} size={24} /></div>
-            <DisplayName account={status.get('account')} inline />
-          </a>
-        </header>
-
-        <div className='quote-indicator__content translate' dangerouslySetInnerHTML={content} />
-
-        {status.get('media_attachments').size > 0 && (
-          <AttachmentList
-            compact
-            media={status.get('media_attachments')}
-          />
-        )}
-      </article>
-    );
-  }
-
-}
-
-export default withOptionalRouter(injectIntl(QuoteIndicator));

app/javascript/flavours/glitch/features/compose/containers/quote_indicator_container.js

@@ -1,31 +0,0 @@
-import { connect } from 'react-redux';
-
-import { cancelQuoteCompose } from 'flavours/glitch/actions/compose';
-import { makeGetStatus } from '../../../selectors';
-import QuoteIndicator from '../components/quote_indicator';
-
-const makeMapStateToProps = () => {
-  const getStatus = makeGetStatus();
-
-  const mapStateToProps = state => {
-    const statusId = state.getIn(['compose', 'quote_id'], null);
-    const editing  = false;
-
-    return {
-      status: getStatus(state, { id: statusId }),
-      editing,
-    };
-  };
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = dispatch => ({
-
-  onCancel () {
-    dispatch(cancelQuoteCompose());
-  },
-
-});
-
-export default connect(makeMapStateToProps, mapDispatchToProps)(QuoteIndicator);

app/javascript/flavours/glitch/styles/components.scss

@@ -1019,7 +1019,6 @@ body > [data-popper-placement] {
 
 .status__content,
 .edit-indicator__content,
-.quote-indicator__content,
 .reply-indicator__content {
   position: relative;
   word-wrap: break-word;
@@ -1117,8 +1116,7 @@ body > [data-popper-placement] {
 }
 
 
-.reply-indicator,
-.quote-indicator {
+.reply-indicator {
   display: grid;
   grid-template-columns: 46px minmax(0, 1fr);
   grid-template-rows: 46px max-content;

app/javascript/flavours/glitch/styles/contrast/diff.scss

@@ -14,7 +14,6 @@
 
 .status__content a,
 .link-footer a,
-.quote-indicator__content a,
 .reply-indicator__content a,
 .status__content__read-more-button,
 .status__content__translate-button {

app/javascript/flavours/glitch/styles/mastodon-light/diff.scss

@@ -263,7 +263,6 @@ html {
 }
 
 // Change the background colors of status__content__spoiler-link
-.quote-indicator__content .status__content__spoiler-link,
 .reply-indicator__content .status__content__spoiler-link,
 .status__content .status__content__spoiler-link {
   background: $ui-base-color;
@@ -628,14 +627,12 @@ html {
   }
 }
 
-.quote-indicator,
 .reply-indicator {
   background: transparent;
   border: 1px solid lighten($ui-base-color, 8%);
 }
 
 .status__content,
-.quote-indicator__content,
 .reply-indicator__content {
   a {
     color: $highlight-text-color;

app/javascript/flavours/glitch/styles/rich_text.scss

@@ -2,7 +2,6 @@
 .status__content__text,
 .e-content,
 .edit-indicator__content,
-.quote-indicator__content,
 .reply-indicator__content {
   pre,
   blockquote {
@@ -94,7 +93,6 @@
   }
 }
 
-.quote-indicator__content,
 .reply-indicator__content {
   blockquote {
     border-inline-start-color: $inverted-text-color;