diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py index e6f9fd0..79cd31b 100644 --- a/prosopopee/prosopopee.py +++ b/prosopopee/prosopopee.py @@ -64,7 +64,7 @@ class Video(object): } warning("Generation", source) if options.get("resize"): - command = "ffmpeg {loglevel} -i {source} {resize} -vframes 1 -y {target}".format(**ffmpeg_switches) + command = "ffmpeg {loglevel} -i {source} {resolution} -vframes 1 -y {target}".format(**ffmpeg_switches) os.system(command) else: command = "ffmpeg {loglevel} -i {source} {resolution} {preselect} {bitrate} -pass 1 -an {format} -y {target}".format(**ffmpeg_switches) diff --git a/prosopopee/themes/exposure/static/css/style-page.css b/prosopopee/themes/exposure/static/css/style-page.css index 635c784..ca17c42 100644 --- a/prosopopee/themes/exposure/static/css/style-page.css +++ b/prosopopee/themes/exposure/static/css/style-page.css @@ -348,6 +348,13 @@ a.google { height: auto; } +.full-picture video { + position: fixed; right: 0; bottom: 0; + min-width: 100%; min-height: 100%; + width: auto; height: auto; z-index: -100; + background-size: cover; +} + .bordered-picture video { width: 77%; margin-left: 11.5%; @@ -362,3 +369,35 @@ a.google { margin-bottom: 40px; margin-top: 40px; } + +.video-container { + position: relative; + bottom: 0%; + left: 0%; + height: 100%; + width: 100%; + overflow: hidden; + background: #000; +} + +.video-container .title-container { + z-index: 1000; + position: absolute; + background-color: rgba(0, 0, 0, .4); + width: 100%; + height: 100%; + display: flex; + color: white; + align-items: center; + justify-content: center; + text-align: center; +} + +.video-container video { + position: absolute; + z-index: 0; + bottom: 0; +} +.video-container video.fillWidth { + width: 100%; +} diff --git a/prosopopee/themes/exposure/templates/sections/bordered-picture.html b/prosopopee/themes/exposure/templates/sections/bordered-picture.html index cd93471..7f246ad 100644 --- a/prosopopee/themes/exposure/templates/sections/bordered-picture.html +++ b/prosopopee/themes/exposure/templates/sections/bordered-picture.html @@ -10,8 +10,8 @@ {% endif %} {% if video %}
- -