diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-01 15:29:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 15:29:35 +0200 |
| commit | 20e75666b2c52be6bbc7fe3f6fbe4278f35dde15 (patch) | |
| tree | ea47c70306d15e6b187ce0d37f9dd2936ee9b29d /app/views/stream_entries/_media.html.haml | |
| parent | 88b593a63ff3d607d6f98553654c46bc7cfc0b7b (diff) | |
| parent | a0d01119794655dc789eda94905304679de070e8 (diff) | |
Merge pull request #619 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/stream_entries/_media.html.haml')
| -rw-r--r-- | app/views/stream_entries/_media.html.haml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/views/stream_entries/_media.html.haml b/app/views/stream_entries/_media.html.haml deleted file mode 100644 index 32d024cf6..000000000 --- a/app/views/stream_entries/_media.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -.media-item>< - = link_to media.remote_url.blank? ? media.file.url(:original) : media.remote_url, style: media.image? ? "background-image: url(#{media.file.url(:original)})" : '', target: '_blank', rel: 'noopener', class: "u-#{media.video? || media.gifv? ? 'video' : 'photo'}" do - - unless media.image? - %video{ src: media.file.url(:original), autoplay: true, loop: true }/ |