tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Media gallery styling closer to upstream's

Browse Source
This commit is contained in:
Thibaut Girka
2018-09-03 20:46:00 +02:00
committed by ThibG
parent 8183d2ed55
commit be644e3b7c
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/flavours/glitch/components/media_gallery.js
View File

@@ -163,7 +163,8 @@ class Item extends React.PureComponent {
sizes={sizes}
alt={attachment.get('description')}
title={attachment.get('description')}
style={{ objectPosition: `${x}% ${y}%` }} />
style={{ objectPosition: `${x}% ${y}%` }}
/>
</a>
);
} else if (attachment.get('type') === 'gifv') {
@@ -191,7 +192,7 @@ class Item extends React.PureComponent {
}
return (
<div className={classNames('media-gallery__item', { standalone })} key={attachment.get('id')} style={{ left: left, top: top, right: right, bottom: bottom, width: `${width}%`, height: `${height}%` }}>
<div className={classNames('media-gallery__item', { standalone, letterbox })} key={attachment.get('id')} style={{ left: left, top: top, right: right, bottom: bottom, width: `${width}%`, height: `${height}%` }}>
{thumbnail}
</div>
);
@@ -261,6 +262,8 @@ export default class MediaGallery extends React.PureComponent {
if (this.isStandaloneEligible() && width) {
style.height = width / this.props.media.getIn([0, 'meta', 'small', 'aspect']);
} else if (width) {
style.height = width / (16/9);
}
if (!visible) {
@@ -280,7 +283,7 @@ export default class MediaGallery extends React.PureComponent {
}
}
const computedClass = classNames('media-gallery', `size-${size}`, { 'full-width': fullwidth });
const computedClass = classNames('media-gallery', { 'full-width': fullwidth });
return (
<div className={computedClass} style={style} ref={this.handleRef}>