Commit 1f47b570 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'dm-video-viewer' into 'master'

Add video blob viewer

See merge request !10749
parents 93e83afb e4cca4d7
...@@ -61,11 +61,13 @@ ...@@ -61,11 +61,13 @@
.file-content { .file-content {
background: $white-light; background: $white-light;
&.image_file { &.image_file,
&.video {
background: $file-image-bg; background: $file-image-bg;
text-align: center; text-align: center;
img { img,
video {
padding: 20px; padding: 20px;
max-width: 80%; max-width: 80%;
} }
......
...@@ -27,6 +27,8 @@ class Blob < SimpleDelegator ...@@ -27,6 +27,8 @@ class Blob < SimpleDelegator
BlobViewer::Image, BlobViewer::Image,
BlobViewer::Sketch, BlobViewer::Sketch,
BlobViewer::Video,
BlobViewer::PDF, BlobViewer::PDF,
BlobViewer::BinarySTL, BlobViewer::BinarySTL,
......
module BlobViewer
class Video < Base
include Rich
include ClientSide
self.partial_name = 'video'
self.extensions = UploaderHelper::VIDEO_EXT
self.binary = true
self.switcher_icon = 'film'
self.switcher_title = 'video'
end
end
.file-content.video
%video{ src: blob_raw_url, controls: true, data: { setup: '{}' } }
---
title: Display video blobs in-line like images
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment