diff --git a/css/_inlay.scss b/css/_inlay.scss new file mode 100644 index 0000000000..2f88c153a7 --- /dev/null +++ b/css/_inlay.scss @@ -0,0 +1,29 @@ +.inlay { + margin-top: 14%; + @include border-radius(3px); + padding: 40px 38px 44px; + color: #fff; + background: lighten($defaultBackground, 20%); + text-align: center; + + &__title { + margin: 12px 0; + padding-bottom: 17px; + color: $popoverFontColor; + font-size: 21px; + letter-spacing: 0.3px; + border-bottom: 1px solid $auiBorderColor; + } + + &__text { + color: $popoverFontColor; + display: block; + margin-top: 22px; + font-size: 16px; + } + + &__icon { + margin: 0 10px; + font-size: 50px; + } +} \ No newline at end of file diff --git a/css/main.scss b/css/main.scss index 677c536b96..c255bc4882 100644 --- a/css/main.scss +++ b/css/main.scss @@ -38,6 +38,7 @@ @import 'toastr'; @import 'base'; @import 'overlay/overlay'; +@import 'inlay'; @import 'reload_overlay/reload_overlay'; @import 'modals/dialog'; @import 'modals/feedback/feedback'; diff --git a/css/overlay/_overlay.scss b/css/overlay/_overlay.scss index 4e993da55a..9727bd7bec 100644 --- a/css/overlay/_overlay.scss +++ b/css/overlay/_overlay.scss @@ -26,35 +26,6 @@ &__policy { position: absolute; bottom: 24px; - } -} - -.inlay { - margin-top: 14%; - @include border-radius(3px); - padding: 40px 38px 44px; - color: #fff; - background: lighten($defaultBackground, 20%); - text-align: center; - - &__title { - margin: 12px 0; - padding-bottom: 17px; - color: $popoverFontColor; - font-size: 21px; - letter-spacing: 0.3px; - border-bottom: 1px solid $auiBorderColor; - } - - &__text { - color: $popoverFontColor; - display: block; - margin-top: 22px; - font-size: 16px; - } - - &__icon { - margin: 0 10px; - font-size: 50px; + width: 100%; } } \ No newline at end of file diff --git a/interface_config.js b/interface_config.js index f00a960285..728da66859 100644 --- a/interface_config.js +++ b/interface_config.js @@ -57,5 +57,6 @@ var interfaceConfig = { // eslint-disable-line no-unused-vars // disables the ringing sound when the RingOverlay is shown. DISABLE_RINGING: false, AUDIO_LEVEL_PRIMARY_COLOR: "rgba(255,255,255,0.4)", - AUDIO_LEVEL_SECONDARY_COLOR: "rgba(255,255,255,0.2)" + AUDIO_LEVEL_SECONDARY_COLOR: "rgba(255,255,255,0.2)", + POLICY_LOGO: null }; diff --git a/lang/main.json b/lang/main.json index edc324d457..58a598fc5a 100644 --- a/lang/main.json +++ b/lang/main.json @@ -75,6 +75,10 @@ "content": "Learn about your users through easy integration with Piwik, Google Analytics, and other usage monitoring and statistics systems." } }, + "startupoverlay": { + "policyText": " ", + "title": "Jitsi Meet needs to use your microphone and camera." + }, "toolbar": { "mute": "Mute / Unmute", "videomute": "Start / stop camera", diff --git a/modules/UI/gum_overlay/UserMediaPermissionsGuidanceOverlay.js b/modules/UI/gum_overlay/UserMediaPermissionsGuidanceOverlay.js index 2f862f2037..5507a7fe7a 100644 --- a/modules/UI/gum_overlay/UserMediaPermissionsGuidanceOverlay.js +++ b/modules/UI/gum_overlay/UserMediaPermissionsGuidanceOverlay.js @@ -22,32 +22,31 @@ class GUMOverlayImpl extends Overlay { * @inheritDoc */ _buildOverlayContent() { - // `` - let title = 'HipChat Video needs to use your microphone and camera.'; - let text; - text = 'Select "Allow" when your browser asks for these permissions.'; - let content = ( - `