diff --git a/bigbluebutton-html5/imports/ui/components/audio/permissions-overlay/styles.scss b/bigbluebutton-html5/imports/ui/components/audio/permissions-overlay/styles.scss
index 0267c58b46da4d08b5b743395779df9841aceb10..0f7210e17bef3019bdf630d68253f1e90a483b49 100644
--- a/bigbluebutton-html5/imports/ui/components/audio/permissions-overlay/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/audio/permissions-overlay/styles.scss
@@ -1,6 +1,4 @@
:root {
- --position-left-edge: 60%;
- --position-bottom-edge: 5%;
--position-top-firefox: 8em;
--position-left-firefox: 22em;
--position-top-chrome: 5.5em;
@@ -8,8 +6,6 @@
--position-top-safari: 150px;
--arrow-top: -65px;
--arrow-left: -20px;
- --arrow-top-edge: -2.5rem;
- --arrow-left-edge: -21rem;
--rtl-hint-top: 15rem;
}
@@ -33,21 +29,6 @@
animation: bounce 2s infinite;
}
}
-
- :global(.browser-edge) &:after {
- top: var(--arrow-top-edge);
- left: var(--arrow-left-edge);
- right: auto;
- font-size: 20px;
- :global(.animationsEnabled) & {
- animation: bounceRotate 2s infinite;
- }
-
- [dir="rtl"] & {
- left: auto;
- right: var(--arrow-left-edge);
- }
- }
}
@mixin useRTLPosition() {
@@ -57,16 +38,6 @@
}
@mixin positionHint() {
- :global(.browser-edge) & {
- left: var(--position-left-edge);
- right: auto;
- bottom: var(--position-bottom-edge);
-
- [dir="rtl"] & {
- left: auto;
- right: var(--position-left-edge);
- }
- }
:global(.browser-firefox) & {
top: var(--position-top-firefox);
left: var(--position-left-firefox);
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
index 868a684d04514bbe4284f08e1ee12b7337d4531b..06a822f6342f1e0514d5c587b02c669d95efbde3 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
@@ -3,8 +3,6 @@ import PropTypes from 'prop-types';
import cx from 'classnames';
import { HEXToINTColor, INTToHEXColor } from '/imports/utils/hexInt';
import { defineMessages, injectIntl } from 'react-intl';
-import browserInfo from '/imports/utils/browserInfo';
-import { noop } from 'lodash';
import KEY_CODES from '/imports/utils/keyCodes';
import injectWbResizeEvent from '/imports/ui/components/presentation/resize-wrapper/component';
import { styles } from './styles.scss';
@@ -64,9 +62,6 @@ const intlMessages = defineMessages({
},
});
-const { isEdge } = browserInfo;
-const runExceptInEdge = fn => (isEdge ? noop : fn);
-
class WhiteboardToolbar extends Component {
constructor(props) {
super(props);
@@ -129,8 +124,6 @@ class WhiteboardToolbar extends Component {
this.handleColorChange = this.handleColorChange.bind(this);
this.handleMouseEnter = this.handleMouseEnter.bind(this);
this.handleMouseLeave = this.handleMouseLeave.bind(this);
- this.componentDidMount = runExceptInEdge(this.componentDidMount);
- this.componentDidUpdate = runExceptInEdge(this.componentDidUpdate);
this.panOn = this.panOn.bind(this);
this.panOff = this.panOff.bind(this);
}
@@ -610,49 +603,36 @@ class WhiteboardToolbar extends Component {
return (
<svg className={styles.customSvgIcon} shapeRendering="geometricPrecision">
- {isEdge
- ? (
- <circle
- cx="50%"
- cy="50%"
- r={thicknessSelected.value}
- stroke="black"
- strokeWidth="1"
- fill={colorSelected.value}
- />
- )
- : (
- <circle
- shapeRendering="geometricPrecision"
- cx="50%"
- cy="50%"
- stroke="black"
- strokeWidth="1"
- >
- <animate
- ref={(ref) => { this.thicknessListIconColor = ref; }}
- attributeName="fill"
- attributeType="XML"
- from={prevColorSelected.value}
- to={colorSelected.value}
- begin="indefinite"
- dur={TRANSITION_DURATION}
- repeatCount="1"
- fill="freeze"
- />
- <animate
- ref={(ref) => { this.thicknessListIconRadius = ref; }}
- attributeName="r"
- attributeType="XML"
- from={prevThicknessSelected.value}
- to={thicknessSelected.value}
- begin="indefinite"
- dur={TRANSITION_DURATION}
- repeatCount="1"
- fill="freeze"
- />
- </circle>
- )}
+ <circle
+ shapeRendering="geometricPrecision"
+ cx="50%"
+ cy="50%"
+ stroke="black"
+ strokeWidth="1"
+ >
+ <animate
+ ref={(ref) => { this.thicknessListIconColor = ref; }}
+ attributeName="fill"
+ attributeType="XML"
+ from={prevColorSelected.value}
+ to={colorSelected.value}
+ begin="indefinite"
+ dur={TRANSITION_DURATION}
+ repeatCount="1"
+ fill="freeze"
+ />
+ <animate
+ ref={(ref) => { this.thicknessListIconRadius = ref; }}
+ attributeName="r"
+ attributeType="XML"
+ from={prevThicknessSelected.value}
+ to={thicknessSelected.value}
+ begin="indefinite"
+ dur={TRANSITION_DURATION}
+ repeatCount="1"
+ fill="freeze"
+ />
+ </circle>
</svg>
);
}
@@ -711,33 +691,19 @@ class WhiteboardToolbar extends Component {
return (
<svg className={styles.customSvgIcon}>
- {isEdge
- ? (
- <rect
- x="25%"
- y="25%"
- width="50%"
- height="50%"
- stroke="black"
- strokeWidth="1"
- fill={colorSelected.value}
- />
- ) : (
- <rect x="25%" y="25%" width="50%" height="50%" stroke="black" strokeWidth="1">
- <animate
- ref={(ref) => { this.colorListIconColor = ref; }}
- attributeName="fill"
- attributeType="XML"
- from={prevColorSelected.value}
- to={colorSelected.value}
- begin="indefinite"
- dur={TRANSITION_DURATION}
- repeatCount="1"
- fill="freeze"
- />
- </rect>
- )
- }
+ <rect x="25%" y="25%" width="50%" height="50%" stroke="black" strokeWidth="1">
+ <animate
+ ref={(ref) => { this.colorListIconColor = ref; }}
+ attributeName="fill"
+ attributeType="XML"
+ from={prevColorSelected.value}
+ to={colorSelected.value}
+ begin="indefinite"
+ dur={TRANSITION_DURATION}
+ repeatCount="1"
+ fill="freeze"
+ />
+ </rect>
</svg>
);
}
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/mixins/_scrollable.scss b/bigbluebutton-html5/imports/ui/stylesheets/mixins/_scrollable.scss
index 31a9aa9ac37ee0d957b86627fed2f36aeedb9bf2..3f737a97bed574a215e6c4f5a3c9c5a6237314e7 100644
--- a/bigbluebutton-html5/imports/ui/stylesheets/mixins/_scrollable.scss
+++ b/bigbluebutton-html5/imports/ui/stylesheets/mixins/_scrollable.scss
@@ -12,10 +12,6 @@
background-size: 100% 40px, 100% 40px, 100% 14px, 100% 14px;
background-attachment: local, local, scroll, scroll;
- :global(.browser-edge) & {
- background: none;
- }
-
// Fancy scroll
&::-webkit-scrollbar {
width: 5px;