['settings' page] fixup for the display of the logo

haiwen · Jul 10, 2024 · 1382c50 · 1382c50
1 parent a378b24
commit 1382c50
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/frontend/src/components/logo.js b/frontend/src/components/logo.js
@@ -1,11 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { siteRoot, mediaUrl, logoPath, logoWidth, logoHeight, siteTitle } from '../utils/constants';
+import { Utils } from '../utils/utils';
 
 const propTypes = {
   onCloseSidePanel: PropTypes.func,
   showCloseSidePanelIcon: PropTypes.bool,
-  positioned: PropTypes.bool
+  positioned: PropTypes.bool,
+  showLogoOnlyInMobile: PropTypes.bool
 };
 
 class Logo extends React.Component {
@@ -15,7 +17,12 @@ class Logo extends React.Component {
   };
 
   render() {
-    const { positioned } = this.props;
+    const { positioned, showLogoOnlyInMobile } = this.props;
+
+    if (showLogoOnlyInMobile && Utils.isDesktop()) {
+      return null;
+    }
+
     return (
       <div className={`top-logo ${positioned ? 'd-none d-md-block positioned-top-logo' : ''}`}>
         <a href={siteRoot} id="logo">

diff --git a/frontend/src/components/side-panel.js b/frontend/src/components/side-panel.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import { Utils } from '../utils/utils';
 import Logo from './logo';
 import MainSideNav from './main-side-nav';
 import { SIDE_PANEL_FOLDED_WIDTH } from '../constants';
@@ -25,7 +24,10 @@ class SidePanel extends React.Component {
     return (
       <div className={classnames('side-panel', { 'side-panel-folded': isSidePanelFolded, 'left-zero': !this.props.isSidePanelClosed })} style={style}>
         <div className={'side-panel-north'}>
-          {showLogoOnlyInMobile && !Utils.isDesktop() && <Logo onCloseSidePanel={this.props.onCloseSidePanel} />}
+          <Logo
+            onCloseSidePanel={this.props.onCloseSidePanel}
+            showLogoOnlyInMobile={showLogoOnlyInMobile}
+          />
         </div>
         <div className="side-panel-center">
           {children ? children : (