diff --git a/css/_notice.scss b/css/_notice.scss index 6c8e0fc1b..9d915434b 100644 --- a/css/_notice.scss +++ b/css/_notice.scss @@ -1,11 +1,12 @@ -#notice { +.notice { position: relative; z-index: 3; margin-top: 6px; + + &__message { + background-color: #000000; + color: white; + padding: 3px; + border-radius: 5px; + } } -#noticeText { - background-color: #000000; - color: white; - padding: 3px; - border-radius: 5px; -} \ No newline at end of file diff --git a/modules/UI/UI.js b/modules/UI/UI.js index e58d46593..1ba3b06d0 100644 --- a/modules/UI/UI.js +++ b/modules/UI/UI.js @@ -315,12 +315,6 @@ UI.start = function () { // Initialise the recording module. if (config.enableRecording) Recording.init(eventEmitter, config.recordingType); - - // Display notice message at the top of the toolbar - if (config.noticeMessage) { - $('#noticeText').text(config.noticeMessage); - UIUtil.setVisible('notice', true); - } } else { $("body").addClass("filmstrip-only"); UIUtil.setVisible('mainToolbarContainer', false); diff --git a/react/features/conference/components/Conference.web.js b/react/features/conference/components/Conference.web.js index 82f7c2815..90bd2b8ef 100644 --- a/react/features/conference/components/Conference.web.js +++ b/react/features/conference/components/Conference.web.js @@ -8,23 +8,12 @@ import { DialogContainer } from '../../base/dialog'; import { Watermarks } from '../../base/react'; import { FeedbackButton } from '../../feedback'; import { OverlayContainer } from '../../overlay'; +import { Notice } from '../../toolbar'; import { HideNotificationBarStyle } from '../../unsupported-browser'; declare var $: Function; declare var APP: Object; -/** - * For legacy reasons, inline style for display none. - * - * @private - * @type {{ - * display: string - * }} - */ -const _DISPLAY_NONE_STYLE = { - display: 'none' -}; - /** * The conference page of the Web application. */ @@ -78,14 +67,8 @@ class Conference extends Component { return (