From 64210cc610eac148e0466a2a797904892f10844a Mon Sep 17 00:00:00 2001
From: Vitor Mateus <vitormateusalmeida@gmail.com>
Date: Wed, 30 Jan 2019 15:43:11 -0200
Subject: [PATCH] Fixes
---
bigbluebutton-html5/client/stylesheets/modals.css | 4 ----
.../ui/components/audio/audio-controls/styles.scss | 12 +++++++-----
.../imports/ui/components/tooltip/component.jsx | 11 ++++-------
bigbluebutton-html5/private/config/settings.yml | 2 +-
4 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/bigbluebutton-html5/client/stylesheets/modals.css b/bigbluebutton-html5/client/stylesheets/modals.css
index ff491e5cff..dbd6263f8d 100755
--- a/bigbluebutton-html5/client/stylesheets/modals.css
+++ b/bigbluebutton-html5/client/stylesheets/modals.css
@@ -1,7 +1,3 @@
-:root{
- --enableAnimation: 1;
-}
-
.ReactModal__Overlay {
-webkit-perspective: 600;
perspective: 600;
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/styles.scss b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/styles.scss
index 2e81f0ddd0..66475595d1 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/styles.scss
@@ -37,11 +37,13 @@
}
}
- [style~="--enableAnimation:0;"] .button.glow {
- background-clip: padding-box;
- border: 3px solid transparent;
- box-shadow: 0 0 0 2px rgba(255,255,255,.5);
- }
+[style~="--enableAnimation:0;"] .button.glow span {
+ content: '';
+ outline: none !important;
+ background-clip: padding-box;
+ border: var(--border-size-large) solid transparent;
+ box-shadow: 0 0 0 var(--border-size) rgba(255,255,255,.5);
+}
@keyframes pulse {
0% {
diff --git a/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx b/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
index 5c4ac0b330..5ec575588c 100755
--- a/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
@@ -69,18 +69,15 @@ class Tooltip extends Component {
componentDidUpdate() {
const { enableAnimation } = this.state;
const { animations } = Settings.application;
+
if (animations !== enableAnimation) {
const elements = document.querySelectorAll('[id^="tippy-"]');
elements.forEach((e) => {
const instance = e._tippy;
- if (animations) instance.set({ animation: 'shift-away' });
- if (!animations) instance.set({ animation: 'none' });
+ instance.set({ animation: animations ? 'shift-away' : 'none' });
});
- if (animations) {
- this.setEnableAnimation(true);
- } else {
- this.setEnableAnimation(false);
- }
+
+ this.setEnableAnimation(animations);
}
}
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index 0483f7621d..ac3420e9f5 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -18,7 +18,7 @@ public:
askForFeedbackOnLogout: false
defaultSettings:
application:
- animations: false
+ animations: true
chatAudioAlerts: false
chatPushAlerts: false
fallbackLocale: en
--
GitLab