Page MenuHomePhorge
Files F117817076

D2293.1775287025.diff
No OneTemporary
Actions

Authored By
Unknown
Size
6 KB
Referenced Files
None
Subscribers
None

D2293.1775287025.diff
View Options

diff --git a/src/resources/js/meet/app.js b/src/resources/js/meet/app.js
--- a/src/resources/js/meet/app.js
+++ b/src/resources/js/meet/app.js
@@ -1002,8 +1002,8 @@
+ '<button type="button" class="btn btn-link link-fullscreen open hidden" title="Full screen">' + svgIcon('compress') + '</button>'
+ '</div>'
+ '<div class="status">'
- + '<span class="bg-danger status-audio hidden">' + svgIcon('microphone') + '</span>'
- + '<span class="bg-danger status-video hidden">' + svgIcon('video') + '</span>'
+ + '<span class="bg-secondary status-audio hidden">' + svgIcon('microphone') + '</span>'
+ + '<span class="bg-secondary status-video hidden">' + svgIcon('video') + '</span>'
+ '</div>'
+ '</div>'
)
diff --git a/src/resources/themes/meet.scss b/src/resources/themes/meet.scss
--- a/src/resources/themes/meet.scss
+++ b/src/resources/themes/meet.scss
@@ -46,7 +46,7 @@
.meet-video {
position: relative;
- background: $menu-bg-color;
+ background: #000;
// Use flexbox for centering .watermark
display: flex;
align-items: center;
@@ -74,7 +74,7 @@
}
.watermark {
- color: darken($menu-bg-color, 20%);
+ color: $light;
width: 50%;
height: 50%;
}
@@ -173,9 +173,8 @@
#meet-session-menu {
button {
- font-size: 1.3em;
- padding: 0 0.25em;
- margin: 0.5em;
+ font-size: 1.25em;
+ margin: 0.25em 0.125em;
position: relative;
.badge {
diff --git a/src/resources/vue/Meet/Room.vue b/src/resources/vue/Meet/Room.vue
--- a/src/resources/vue/Meet/Room.vue
+++ b/src/resources/vue/Meet/Room.vue
@@ -1,21 +1,21 @@
<template>
<div id="meet-component">
- <div id="meet-session-toolbar" class="hidden">
+ <div id="meet-session-toolbar" class="bg-white hidden">
<div id="meet-session-menu">
- <button class="btn btn-link link-audio" @click="switchSound" :disabled="!isPublisher()" title="Mute audio">
+ <button class="btn link-audio" @click="switchSound" :disabled="!isPublisher()" title="Mute audio">
<svg-icon icon="microphone"></svg-icon>
</button>
- <button class="btn btn-link link-video" @click="switchVideo" :disabled="!isPublisher()" title="Mute video">
+ <button class="btn link-video" @click="switchVideo" :disabled="!isPublisher()" title="Mute video">
<svg-icon icon="video"></svg-icon>
</button>
- <button class="btn btn-link link-screen text-danger" @click="switchScreen" :disabled="!canShareScreen || !isPublisher()" title="Share screen">
+ <button class="btn link-screen" @click="switchScreen" :disabled="!canShareScreen || !isPublisher()" title="Share screen">
<svg-icon icon="desktop"></svg-icon>
</button>
- <button class="btn btn-link link-hand text-danger" v-if="!isPublisher()" @click="switchHand" title="Raise hand">
+ <button class="btn link-hand" v-if="!isPublisher()" @click="switchHand" title="Raise hand">
<svg-icon icon="hand-paper"></svg-icon>
</button>
<span id="channel-select" :style="'display:' + (channels.length ? '' : 'none')" class="dropdown">
- <button class="btn btn-link link-channel" title="Interpreted language channel" aria-haspopup="true" aria-expanded="false" data-toggle="dropdown">
+ <button class="btn link-channel" title="Interpreted language channel" aria-haspopup="true" aria-expanded="false" data-toggle="dropdown">
<svg-icon icon="headphones"></svg-icon>
<span class="badge badge-danger" v-if="session.channel">{{ session.channel.toUpperCase() }}</span>
</button>
@@ -26,19 +26,19 @@
>{{ languages[code] }}</a>
</div>
</span>
- <button class="btn btn-link link-chat text-danger" @click="switchChat" title="Chat">
+ <button class="btn link-chat" @click="switchChat" title="Chat">
<svg-icon icon="align-left"></svg-icon>
</button>
- <button class="btn btn-link link-fullscreen closed hidden" @click="switchFullscreen" title="Full screen">
+ <button class="btn link-fullscreen closed hidden" @click="switchFullscreen" title="Full screen">
<svg-icon icon="expand"></svg-icon>
</button>
- <button class="btn btn-link link-fullscreen open hidden" @click="switchFullscreen" title="Full screen">
+ <button class="btn link-fullscreen open hidden" @click="switchFullscreen" title="Full screen">
<svg-icon icon="compress"></svg-icon>
</button>
- <button class="btn btn-link link-options" v-if="isRoomOwner()" @click="roomOptions" title="Room options">
+ <button class="btn link-options" v-if="isRoomOwner()" @click="roomOptions" title="Room options">
<svg-icon icon="cog"></svg-icon>
</button>
- <button class="btn btn-link link-logout" @click="logout" title="Leave session">
+ <button class="btn link-logout" @click="logout" title="Leave session">
<svg-icon icon="power-off"></svg-icon>
</button>
</div>
@@ -102,12 +102,12 @@
</div>
</div>
- <div id="meet-session-layout" class="d-flex hidden">
+ <div id="meet-session-layout" class="d-flex bg-light hidden">
<div id="meet-queue">
<div class="head" title="Q &amp; A"><svg-icon icon="microphone-alt"></svg-icon></div>
</div>
<div id="meet-session"></div>
- <div id="meet-chat">
+ <div id="meet-chat" class="bg-secondary pt-2">
<div class="chat"></div>
<div class="chat-input m-2">
<textarea class="form-control" rows="1"></textarea>
@@ -616,7 +616,10 @@
setMenuItem(type, state, disabled) {
let button = $('#meet-session-menu').find('.link-' + type)
- button[state ? 'removeClass' : 'addClass']('text-danger')
+
+ if(['audio', 'video', 'screen', 'hand'].includes(type)) {
+ button[state ? 'removeClass' : 'addClass']('btn-secondary text-light')
+ }
if (disabled !== undefined) {
button.prop('disabled', disabled)

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 4, 7:17 AM (1 d, 10 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18828491
Default Alt Text
D2293.1775287025.diff (6 KB)

Event Timeline