diff --git a/css/_variables.scss b/css/_variables.scss index a6a8b0dab7..e20787aba2 100644 --- a/css/_variables.scss +++ b/css/_variables.scss @@ -164,6 +164,9 @@ $unsupportedDesktopBrowserTextFontSize: 21px; $watermarkWidth: 186px; $watermarkHeight: 74px; +$welcomePageWatermarkWidth: 186px; +$welcomePageWatermarkHeight: 74px; + /** * Welcome page variables. */ diff --git a/css/_welcome_page.scss b/css/_welcome_page.scss index f2b160edf5..a1171aa1e0 100644 --- a/css/_welcome_page.scss +++ b/css/_welcome_page.scss @@ -211,5 +211,10 @@ body.welcome-page { position: absolute; width: 100%; height: 100%; + + .watermark.leftwatermark { + width: $welcomePageWatermarkWidth; + height: $welcomePageWatermarkHeight; + } } } diff --git a/interface_config.js b/interface_config.js index c45590c2cc..45358fc0b5 100644 --- a/interface_config.js +++ b/interface_config.js @@ -48,6 +48,7 @@ var interfaceConfig = { DEFAULT_LOCAL_DISPLAY_NAME: 'me', DEFAULT_LOGO_URL: 'images/watermark.png', DEFAULT_REMOTE_DISPLAY_NAME: 'Fellow Jitster', + DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/watermark.png', DISABLE_DOMINANT_SPEAKER_INDICATOR: false, diff --git a/react/features/base/react/components/web/Watermarks.js b/react/features/base/react/components/web/Watermarks.js index 69a9087053..36c39d938c 100644 --- a/react/features/base/react/components/web/Watermarks.js +++ b/react/features/base/react/components/web/Watermarks.js @@ -47,6 +47,11 @@ type Props = { */ _welcomePageIsVisible: boolean, + /** + * The default value for the Jitsi logo URL. + */ + defaultJitsiLogoURL: ?string, + /** * Invoked to obtain translated strings. */ @@ -218,13 +223,14 @@ class Watermarks extends Component { let reactElement = null; const { _customLogoUrl, - _customLogoLink + _customLogoLink, + defaultJitsiLogoURL } = this.props; if (this._canDisplayJitsiWatermark()) { const link = _customLogoLink || this.state.jitsiWatermarkLink; const style = { - backgroundImage: `url(${_customLogoUrl || interfaceConfig.DEFAULT_LOGO_URL})`, + backgroundImage: `url(${_customLogoUrl || defaultJitsiLogoURL || interfaceConfig.DEFAULT_LOGO_URL})`, maxWidth: 140, maxHeight: 70 }; diff --git a/react/features/welcome/components/WelcomePage.web.js b/react/features/welcome/components/WelcomePage.web.js index 5fb77307cd..af39f2d7c8 100644 --- a/react/features/welcome/components/WelcomePage.web.js +++ b/react/features/welcome/components/WelcomePage.web.js @@ -159,7 +159,7 @@ class WelcomePage extends AbstractWelcomePage { */ render() { const { _moderatedRoomServiceUrl, t } = this.props; - const { APP_NAME } = interfaceConfig; + const { APP_NAME, DEFAULT_WELCOME_PAGE_LOGO_URL } = interfaceConfig; const showAdditionalContent = this._shouldShowAdditionalContent(); const showAdditionalToolbarContent = this._shouldShowAdditionalToolbarContent(); const showResponsiveText = this._shouldShowResponsiveText(); @@ -170,7 +170,7 @@ class WelcomePage extends AbstractWelcomePage { ? 'with-content' : 'without-content'}` } id = 'welcome_page'>
- +