mirror of
https://github.com/m1k1o/neko.git
synced 2024-07-24 14:40:50 +12:00
Merge branch 'master' into scroll-to-chat-on-mobile
This commit is contained in:
commit
bb595e8f1f
@ -13,6 +13,7 @@
|
|||||||
class="overlay"
|
class="overlay"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
data-gramm="false"
|
data-gramm="false"
|
||||||
|
:style="{ pointerEvents: hosting ? 'auto' : 'none' }"
|
||||||
@click.stop.prevent
|
@click.stop.prevent
|
||||||
@contextmenu.stop.prevent
|
@contextmenu.stop.prevent
|
||||||
@wheel.stop.prevent="onWheel"
|
@wheel.stop.prevent="onWheel"
|
||||||
@ -36,7 +37,7 @@
|
|||||||
<ul v-if="!fullscreen && !hideControls" class="video-menu top">
|
<ul v-if="!fullscreen && !hideControls" class="video-menu top">
|
||||||
<li><i @click.stop.prevent="requestFullscreen" class="fas fa-expand"></i></li>
|
<li><i @click.stop.prevent="requestFullscreen" class="fas fa-expand"></i></li>
|
||||||
<li v-if="admin"><i @click.stop.prevent="openResolution" class="fas fa-desktop"></i></li>
|
<li v-if="admin"><i @click.stop.prevent="openResolution" class="fas fa-desktop"></i></li>
|
||||||
<li v-if="!implicitHosting" :class="extraControls || 'extra-control'">
|
<li v-if="!controlLocked && !implicitHosting" :class="extraControls || 'extra-control'">
|
||||||
<i
|
<i
|
||||||
:class="[hosted && !hosting ? 'disabled' : '', !hosted && !hosting ? 'faded' : '', 'fas', 'fa-keyboard']"
|
:class="[hosted && !hosting ? 'disabled' : '', !hosted && !hosting ? 'faded' : '', 'fas', 'fa-keyboard']"
|
||||||
@click.stop.prevent="toggleControl"
|
@click.stop.prevent="toggleControl"
|
||||||
|
Loading…
Reference in New Issue
Block a user