From fee219ed07d74faa43e38a163662014696002f91 Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Thu, 29 Nov 2018 14:58:39 -0200
Subject: [PATCH] Fix console warning
---
.../ui/components/actions-bar/desktop-share/component.jsx | 2 +-
.../imports/ui/components/actions-bar/styles.scss | 4 ++--
.../imports/ui/components/audio/audio-controls/component.jsx | 4 ++--
bigbluebutton-html5/imports/ui/components/button/styles.scss | 4 ++--
.../ui/components/video-provider/video-menu/component.jsx | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/desktop-share/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/desktop-share/component.jsx
index c50ed5eaf8..1a2ce6c29e 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/desktop-share/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/desktop-share/component.jsx
@@ -75,7 +75,7 @@ const DesktopShare = ({
intlMessages.stopDesktopShareLabel : intlMessages.desktopShareLabel)}
description={intl.formatMessage(isVideoBroadcasting ?
intlMessages.stopDesktopShareDesc : intlMessages.desktopShareDesc)}
- color={isVideoBroadcasting ? 'primary' : ''}
+ color={isVideoBroadcasting ? 'primary' : 'default'}
ghost={!isVideoBroadcasting}
hideLabel
circle
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss b/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss
index 7dd2005f57..7619bf7adc 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss
@@ -51,10 +51,10 @@
box-shadow: none;
background-color: transparent !important;
color: var(--color-white) !important;
- border: 1.5px solid var(--color-white);
+ border: 1.5px solid var(--color-white) !important;
}
span:hover {
- border: 1.5px solid rgba(255,255,255, .5);
+ border: 1.5px solid rgba(255,255,255, .5) !important;
}
}
\ No newline at end of file
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx
index 56d0e7c2c5..dc2bc885d7 100644
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx
@@ -79,7 +79,7 @@ class AudioControls extends Component {
intl.formatMessage(intlMessages.muteAudio)}
aria-label={unmute ? intl.formatMessage(intlMessages.unmuteAudio) :
intl.formatMessage(intlMessages.muteAudio)}
- color={!unmute ? 'primary' : ''}
+ color={!unmute ? 'primary' : 'default'}
ghost={unmute}
icon={unmute ? 'mute' : 'unmute'}
size="lg"
@@ -95,7 +95,7 @@ class AudioControls extends Component {
intl.formatMessage(intlMessages.joinAudio)}
label={join ? intl.formatMessage(intlMessages.leaveAudio) :
intl.formatMessage(intlMessages.joinAudio)}
- color={join ? 'primary' : ''}
+ color={join ? 'primary' : 'default'}
icon={join ? 'audio_on' : 'audio_off'}
size="lg"
circle
diff --git a/bigbluebutton-html5/imports/ui/components/button/styles.scss b/bigbluebutton-html5/imports/ui/components/button/styles.scss
index 170732b7c4..70a37f4150 100644
--- a/bigbluebutton-html5/imports/ui/components/button/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/button/styles.scss
@@ -143,8 +143,8 @@
margin: 0 !important;
padding: 0 !important;
overflow: hidden;
- display: block;
- border: 0 !important;
+ display: none !important;
+
}
.icon {
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
index 6a7d134f94..88ed1f14a2 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
@@ -69,7 +69,7 @@ const JoinVideoOptions = ({
onClick={() => null}
hideLabel
aria-label={intl.formatMessage(intlMessages.videoMenuDesc)}
- color={isSharingVideo ? 'primary' : ''}
+ color={isSharingVideo ? 'primary' : 'default'}
icon={isSharingVideo ? 'video' : 'video_off'}
ghost={!isSharingVideo}
size="lg"
--
GitLab