Commit dab60093 authored by Anton Koch's avatar Anton Koch
Browse files

Merge branch 'ui-styling-betweenus' into 'master'

UI styling Between Us

See merge request !1
parents 1b2a3126 0c17bcb5
<template lang="pug"> <template lang="pug">
vue-video-player(class="video-player video-player-box vjs-big-play-centered", vue-video-player(:class="classConfig",
ref="videoPlayer", ref="videoPlayer",
:options="playerOptions", :options="playerOptions",
:playsinline="true", :playsinline="true",
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
import { videoPlayer } from 'vue-video-player' import { videoPlayer } from 'vue-video-player'
import guessType from 'mbjs-media/src/util/guess-type' import guessType from 'mbjs-media/src/util/guess-type'
if (process.env.FEATURE_BETWEENUS) require('./videojs-betweenus.styl')
export default { export default {
components: { components: {
'vue-video-player': videoPlayer 'vue-video-player': videoPlayer
...@@ -34,6 +36,12 @@ ...@@ -34,6 +36,12 @@
data () { data () {
return { return {
type: undefined, type: undefined,
classConfig: {
'video-player': true,
'video-player-box': true,
'vjs-big-play-centered': true,
'vjs-betweenus': process.env.FEATURE_BETWEENUS
playerOptions: { playerOptions: {
fluid: true, fluid: true,
autoplay: this.autoplay, autoplay: this.autoplay,
font-family 'Roboto'
.video-js .vjs-control-bar
height 40px
.video-js.vjs-paused .vjs-big-play-button
background #2a65ff
width 65px
height 65px
border 0
border-radius 0
margin-top -33px
line-height 65px !important
.vjs-button > .vjs-icon-placeholder:before
font-size 2.5em
padding-top 1px
.video-js .vjs-control-bar
background-color #2a65ffaa
background-color #ffffff55
display: none
line-height 40px
.vjs-fullscreen-control .vjs-icon-placeholder:before
line-height 40px
.video-js .vjs-time-control
font-size 0.85rem
line-height 40px
.video-js .vjs-progress-control
padding-top 3px
background-color #ffffff55
.video-js .vjs-play-progress:before
font-size: 1.5em
right: -0.8em
top: -0.4em
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