diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 4f7ffa3dc6..d71185861b 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -49,10 +49,18 @@ transition: padding-top .3s ease-in; } -.custom-logo-image { - width: 100px; - height: 14px; - overflow: hidden; +.main-logo { + max-width: 100%; + width: 100%; + display: flex; + justify-content: center; + align-items: center; + + .custom-logo-image { + max-width: 100%; + height: 14px; + overflow: hidden; + } } .subnavbar { diff --git a/apps/documenteditor/mobile/src/page/main.jsx b/apps/documenteditor/mobile/src/page/main.jsx index ee4a5434a2..8cc8a09f2d 100644 --- a/apps/documenteditor/mobile/src/page/main.jsx +++ b/apps/documenteditor/mobile/src/page/main.jsx @@ -58,25 +58,22 @@ const MainPage = inject('storeDocumentInfo', 'users', 'storeAppOptions', 'storeV const isShowPlaceholder = !appOptions.isDocReady && (!customization || !(customization.loaderName || customization.loaderLogo)); let isBranding = true, - isHideCustomLogo = false, + isHideLogo = true, customLogoImage = '', - customLogoUrl = '', - isWithLogo = true; + customLogoUrl = ''; if(!appOptions.isDisconnected) { const { logo } = customization; isBranding = appOptions.canBranding || appOptions.canBrandingExt; if(logo && isBranding) { - isHideCustomLogo = logo.visible === false; + isHideLogo = logo.visible === false; if(logo.image || logo.imageDark) { customLogoImage = colorTheme.type === 'dark' ? logo.imageDark ?? logo.image : logo.image ?? logo.imageDark; customLogoUrl = logo.url; } } - - isWithLogo = customLogoImage && !isHideCustomLogo || !customLogoImage } useEffect(() => { @@ -236,14 +233,14 @@ const MainPage = inject('storeDocumentInfo', 'users', 'storeAppOptions', 'storeV showPanels: state.addShowOptions, isBranding }}> - - + +
{ - window.open(`${customLogoImage && customLogoUrl && !isHideCustomLogo ? customLogoUrl : __PUBLISHER_URL__}`, "_blank"); + window.open(`${customLogoImage && customLogoUrl && !isHideLogo ? customLogoUrl : __PUBLISHER_URL__}`, "_blank"); }}> - {customLogoImage && !isHideCustomLogo ? + {customLogoImage && !isHideLogo ? - : isWithLogo ? + : !customLogoImage ? : null}
diff --git a/apps/presentationeditor/mobile/src/page/main.jsx b/apps/presentationeditor/mobile/src/page/main.jsx index 9f82388c06..96a8bf9dca 100644 --- a/apps/presentationeditor/mobile/src/page/main.jsx +++ b/apps/presentationeditor/mobile/src/page/main.jsx @@ -129,25 +129,22 @@ class MainPage extends Component { const isShowPlaceholder = !appOptions.isDocReady && (!customization || !(customization.loaderName || customization.loaderLogo)); let isBranding = true, - isHideCustomLogo = false, + isHideLogo = true, customLogoImage = '', - customLogoUrl = '', - isWithLogo = true; + customLogoUrl = ''; if(!appOptions.isDisconnected) { const { logo } = customization; isBranding = appOptions.canBranding || appOptions.canBrandingExt; if(logo && isBranding) { - isHideCustomLogo = logo.visible === false; + isHideLogo = logo.visible === false; if(logo.image || logo.imageDark) { customLogoImage = colorTheme.type === 'dark' ? logo.imageDark ?? logo.image : logo.image ?? logo.imageDark; customLogoUrl = logo.url; } } - - isWithLogo = customLogoImage && !isHideCustomLogo || !customLogoImage } return ( @@ -161,15 +158,15 @@ class MainPage extends Component { {!this.state.previewVisible ? null : } - + {/* Top Navbar */} - +
{ - window.open(`${customLogoImage && customLogoUrl && !isHideCustomLogo ? customLogoUrl : __PUBLISHER_URL__}`, "_blank"); + window.open(`${customLogoImage && customLogoUrl && !isHideLogo ? customLogoUrl : __PUBLISHER_URL__}`, "_blank"); }}> - {customLogoImage && !isHideCustomLogo ? + {customLogoImage && !isHideLogo ? - : isWithLogo ? + : !customLogoImage ? : null}
diff --git a/apps/spreadsheeteditor/mobile/src/page/main.jsx b/apps/spreadsheeteditor/mobile/src/page/main.jsx index 5f6d9c2825..065c7a17e6 100644 --- a/apps/spreadsheeteditor/mobile/src/page/main.jsx +++ b/apps/spreadsheeteditor/mobile/src/page/main.jsx @@ -125,25 +125,22 @@ class MainPage extends Component { const isShowPlaceholder = !appOptions.isDocReady && (!customization || !(customization.loaderName || customization.loaderLogo)); let isBranding = true, - isHideCustomLogo = false, + isHideLogo = true, customLogoImage = '', - customLogoUrl = '', - isWithLogo = true; + customLogoUrl = ''; if(!appOptions.isDisconnected) { const { logo } = customization; isBranding = appOptions.canBranding || appOptions.canBrandingExt; if(logo && isBranding) { - isHideCustomLogo = logo.visible === false; + isHideLogo = logo.visible === false; if(logo.image || logo.imageDark) { customLogoImage = colorTheme.type === 'dark' ? logo.imageDark ?? logo.image : logo.image ?? logo.imageDark; customLogoUrl = logo.url; } } - - isWithLogo = customLogoImage && !isHideCustomLogo || !customLogoImage } return ( @@ -156,15 +153,15 @@ class MainPage extends Component { wsProps, isBranding }}> - + {/* Top Navbar */} - +
{ - window.open(`${customLogoImage && customLogoUrl && !isHideCustomLogo ? customLogoUrl : __PUBLISHER_URL__}`, "_blank"); + window.open(`${customLogoImage && customLogoUrl && !isHideLogo ? customLogoUrl : __PUBLISHER_URL__}`, "_blank"); }}> - {customLogoImage && !isHideCustomLogo ? + {customLogoImage && !isHideLogo ? - : isWithLogo ? + : !customLogoImage ? : null}