about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYamagishi Kazutoshi <ykzts@desire.sh>2017-04-24 11:10:32 +0900
committerEugen <eugen@zeonfederated.com>2017-04-24 04:10:32 +0200
commit72c984e1057306d1e4df49871b9fb658fd7cbcc6 (patch)
tree0fae4e490607eafaf6d269c101d692b972426f28
parent3d3707a077b83c5bee695e35f8aa67450e24ccd2 (diff)
Fix background-size being overwritten (#2382)
-rw-r--r--app/assets/javascripts/components/components/media_gallery.jsx2
-rw-r--r--app/assets/stylesheets/components.scss2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/components/media_gallery.jsx b/app/assets/javascripts/components/components/media_gallery.jsx
index 6101c2eef..58e134f50 100644
--- a/app/assets/javascripts/components/components/media_gallery.jsx
+++ b/app/assets/javascripts/components/components/media_gallery.jsx
@@ -86,7 +86,7 @@ class Item extends React.PureComponent {
           href={attachment.get('remote_url') || attachment.get('url')}
           onClick={this.handleClick}
           target='_blank'
-          style={{ background: `url(${attachment.get('preview_url')}) no-repeat center`}}
+          style={{ backgroundImage: `url(${attachment.get('preview_url')})` }}
         />
       );
     } else if (attachment.get('type') === 'gifv') {
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 800c97a6b..feab81366 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -2999,6 +2999,8 @@ button.icon-button.active i.fa-retweet {
 }
 
 .media-gallery__item-thumbnail {
+  background-position: center;
+  background-repeat: no-repeat;
   background-size: cover;
   cursor: zoom-in;
   display: block;