procyberian
/
projectx
Archived
forked from Albatross/projectx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge conflict

Browse Source
master
Mustafa Yontar 5 years ago
parent a61a6bb75f
commit 7d4dc9b63d
1 changed files with 2 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      src/lib/RemoteFeed.vue

6
src/lib/RemoteFeed.vue
Unescape View File

@ -1,12 +1,10 @@
<template> <template>
<div class="vid_main" @mouseleave="showaction = false" @mouseover="showaction = true" <div class="vid_main" @mouseleave="showaction = false" @mouseover="showaction = true">
>
<video ref="feed_video" width="100%" height="100%" autoplay playsinline/> <video ref="feed_video" width="100%" height="100%" autoplay playsinline/>
<div class="info">{{ bitrate }}</div> <div class="info">{{ bitrate }}</div>
<div class="infoSlow">Slow Connection</div> <div class="infoSlow">Slow Connection</div>
<div class="actions" v-show="showaction">
<div class="infoName">{{ remoteStream.display }}</div> <div class="infoName">{{ remoteStream.display }}</div>
<div class="actions"> <div class="actions" v-show="showaction">
<v-slider <v-slider
v-model="volume" v-model="volume"
:min="0" :min="0"