diff options
| author | Sorin Davidoi <sorin.davidoi@gmail.com> | 2017-07-09 18:49:07 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-09 18:49:07 +0200 |
| commit | 4122a837fadf8cf59712b5c1790ac0af96bcbc84 (patch) | |
| tree | 7c6449f1b3f7ec2e7bfdd38cd94b0b668780f993 /app | |
| parent | 5fa2dd6e652ac6400b793602c446fcd55000d498 (diff) | |
fix(components/media_modal): Aspect ratio (#4128)
* fix(components/media_modal): Aspect ratio * fix: Remove useless style
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/features/ui/components/image_loader.js | 1 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/ui/components/media_modal.js | 2 | ||||
| -rw-r--r-- | app/javascript/styles/components.scss | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/ui/components/image_loader.js b/app/javascript/mastodon/features/ui/components/image_loader.js index 5ea55d1d2..aad594380 100644 --- a/app/javascript/mastodon/features/ui/components/image_loader.js +++ b/app/javascript/mastodon/features/ui/components/image_loader.js @@ -133,6 +133,7 @@ export default class ImageLoader extends React.PureComponent { width={width} height={height} ref={this.setCanvasRef} + style={{ opacity: loading ? 1 : 0 }} /> {!loading && ( diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js index 769e18820..23f588669 100644 --- a/app/javascript/mastodon/features/ui/components/media_modal.js +++ b/app/javascript/mastodon/features/ui/components/media_modal.js @@ -94,7 +94,7 @@ export default class MediaModal extends ImmutablePureComponent { <div className='media-modal__content'> <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} </ReactSwipeableViews> </div> diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss index 397126ec1..97651b5f4 100644 --- a/app/javascript/styles/components.scss +++ b/app/javascript/styles/components.scss @@ -2935,6 +2935,7 @@ button.icon-button.active i.fa-retweet { canvas { display: block; background: url('../images/void.png') repeat; + object-fit: contain; } } |