[Glitch] Use CSS to trim long card descriptions

Port e713c545b8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
local
Christian Schmidt 1 year ago committed by Claire
parent 11b34a903a
commit 0091b28ffe
  1. 16
      app/javascript/flavours/glitch/features/status/components/card.jsx
  2. 4
      app/javascript/flavours/glitch/styles/components/status.scss

@ -17,16 +17,6 @@ const getHostname = url => {
return parser.hostname; return parser.hostname;
}; };
const trim = (text, len) => {
const cut = text.indexOf(' ', len);
if (cut === -1) {
return text;
}
return text.slice(0, cut) + (text.length > len ? '…' : '');
};
const domParser = new DOMParser(); const domParser = new DOMParser();
const addAutoPlay = html => { const addAutoPlay = html => {
@ -54,7 +44,6 @@ export default class Card extends React.PureComponent {
static propTypes = { static propTypes = {
card: ImmutablePropTypes.map, card: ImmutablePropTypes.map,
maxDescription: PropTypes.number,
onOpenMedia: PropTypes.func.isRequired, onOpenMedia: PropTypes.func.isRequired,
compact: PropTypes.bool, compact: PropTypes.bool,
defaultWidth: PropTypes.number, defaultWidth: PropTypes.number,
@ -63,7 +52,6 @@ export default class Card extends React.PureComponent {
}; };
static defaultProps = { static defaultProps = {
maxDescription: 50,
compact: false, compact: false,
}; };
@ -176,7 +164,7 @@ export default class Card extends React.PureComponent {
} }
render () { render () {
const { card, maxDescription, compact, defaultWidth } = this.props; const { card, compact, defaultWidth } = this.props;
const { width, embedded, revealed } = this.state; const { width, embedded, revealed } = this.state;
if (card === null) { if (card === null) {
@ -195,7 +183,7 @@ export default class Card extends React.PureComponent {
const description = ( const description = (
<div className='status-card__content' lang={language}> <div className='status-card__content' lang={language}>
{title} {title}
{!(horizontal || compact) && <p className='status-card__description'>{trim(card.get('description') || '', maxDescription)}</p>} {!(horizontal || compact) && <p className='status-card__description' title={card.get('description')}>{card.get('description')}</p>}
<span className='status-card__host'>{provider}</span> <span className='status-card__host'>{provider}</span>
</div> </div>
); );

@ -833,6 +833,10 @@ a.status-card {
.status-card__description { .status-card__description {
color: $darker-text-color; color: $darker-text-color;
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
} }
.status-card__host { .status-card__host {

Loading…
Cancel
Save