feat(Watermarks): Add deafault logo prop.
This commit is contained in:
parent
004c1b65ad
commit
8e9a51f742
|
@ -164,6 +164,9 @@ $unsupportedDesktopBrowserTextFontSize: 21px;
|
|||
$watermarkWidth: 186px;
|
||||
$watermarkHeight: 74px;
|
||||
|
||||
$welcomePageWatermarkWidth: 186px;
|
||||
$welcomePageWatermarkHeight: 74px;
|
||||
|
||||
/**
|
||||
* Welcome page variables.
|
||||
*/
|
||||
|
|
|
@ -211,5 +211,10 @@ body.welcome-page {
|
|||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
|
||||
.watermark.leftwatermark {
|
||||
width: $welcomePageWatermarkWidth;
|
||||
height: $welcomePageWatermarkHeight;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
||||
|
|
|
@ -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<Props, State> {
|
|||
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
|
||||
};
|
||||
|
|
|
@ -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'>
|
||||
<div className = 'welcome-watermark'>
|
||||
<Watermarks />
|
||||
<Watermarks defaultJitsiLogoURL = { DEFAULT_WELCOME_PAGE_LOGO_URL } />
|
||||
</div>
|
||||
<div className = 'header'>
|
||||
<div className = 'welcome-page-settings'>
|
||||
|
|
Loading…
Reference in New Issue