Merge branch 'feature/updating_quote_statuses' of...

Merge branch 'feature/updating_quote_statuses' of https://code.gab.com/gab/social/gab-social into develop

app/javascript/gabsocial/components/status_content.js

@@ -7,7 +7,7 @@ import Permalink from './permalink';
 import classnames from 'classnames';
 import Icon from 'gabsocial/components/icon';
 
-const MAX_HEIGHT = 642; // 20px * 32 (+ 2px padding at the top)
+const MAX_HEIGHT = 200;
 
 export default class StatusContent extends React.PureComponent {
 

app/javascript/gabsocial/components/status_quote.js

@@ -7,36 +7,37 @@ import { connect } from 'react-redux';
 import { NavLink } from 'react-router-dom';
 
 const mapStateToProps = (state, { id }) => ({
-  status: state.getIn(['statuses', id]),
-  account: state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
+ status: state.getIn(['statuses', id]),
+ account: state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
 });
 
 @connect(mapStateToProps)
 export default class StatusQuote extends React.PureComponent {
 
- static contextTypes = {
- router: PropTypes.object,
- };
- 
- static propTypes = {
- status: ImmutablePropTypes.map.isRequired,
- };
-
- render() {
- const { status, account } = this.props;
-
- const statusUrl = `/${account.get('acct')}/posts/${status.get('id')}`;
-
- return (
- <NavLink to={statusUrl} className="status__quote">
- <DisplayName account={account} />
-
- <StatusContent
- status={status}
- expanded={false}
- />
- </NavLink>
- );
- }
+ static contextTypes = {
+ router: PropTypes.object,
+ };
+
+ static propTypes = {
+ status: ImmutablePropTypes.map.isRequired,
+ };
+
+ render() {
+ const { status, account } = this.props;
+
+ const statusUrl = `/${account.get('acct')}/posts/${status.get('id')}`;
+
+ return (
+ <NavLink to={statusUrl} className="status__quote">
+ <DisplayName account={account} />
+ <StatusContent
+ status={status}
+ expanded={false}
+ onClick
+ collapsable
+ />
+ </NavLink>
+ );
+ }
 
 }
\ No newline at end of file

app/javascript/styles/gabsocial/components.scss

@@ -428,7 +428,7 @@
 }
 
 .status__content.status__content--collapsed {
- max-height: 20px * 15; // 15 lines is roughly above 500 characters
+ max-height: 20px * 10; // 10 lines x 20px per line of text
 }
 
 .status__content__read-more-button {