treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

fix(components/media_modal): Aspect ratio (#4128) 

* fix(components/media_modal): Aspect ratio

* fix: Remove useless style
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Sorin Davidoi 2017-07-09 18:49:07 +02:00 committed by Eugen Rochko
parent 5fa2dd6e65
commit 4122a837fa
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/mastodon/features/ui/components/image_loader.js
View File

@ -133,6 +133,7 @@ export default class ImageLoader extends React.PureComponent {
width={width} width={width}
height={height} height={height}
ref={this.setCanvasRef} ref={this.setCanvasRef}
style={{ opacity: loading ? 1 : 0 }}
/> />
{!loading && ( {!loading && (

2
app/javascript/mastodon/features/ui/components/media_modal.js
View File

@ -94,7 +94,7 @@ export default class MediaModal extends ImmutablePureComponent {
<div className='media-modal__content'> <div className='media-modal__content'>
<IconButton className='media-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={16} /> <IconButton className='media-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={16} />
<ReactSwipeableViews onChangeIndex={this.handleSwipe} index={index}> <ReactSwipeableViews onChangeIndex={this.handleSwipe} index={index} animateHeight>
{content} {content}
</ReactSwipeableViews> </ReactSwipeableViews>
</div> </div>

1
app/javascript/styles/components.scss
View File

@ -2935,6 +2935,7 @@ button.icon-button.active i.fa-retweet {
canvas { canvas {
display: block; display: block;
background: url('../images/void.png') repeat; background: url('../images/void.png') repeat;
object-fit: contain;
} }
} }