From 97b32d40bea3ef1ae0e0d82c97319cb4fcddd1c7 Mon Sep 17 00:00:00 2001 From: Tristan Chuine Date: Fri, 8 Dec 2023 13:35:17 +0100 Subject: [PATCH] review + fix --- demo/src/app.js | 2 +- src/components/TopBar/AboutDialog.js | 10 +++++++++- src/components/TopBar/TopBar.js | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/demo/src/app.js b/demo/src/app.js index 1c379d3e..dc076e13 100644 --- a/demo/src/app.js +++ b/demo/src/app.js @@ -715,7 +715,7 @@ const AppContent = ({ language, onLanguageClick }) => { appVersion={AppPackage.version} appLicense={AppPackage.license} getGlobalVersion={simulateGetGlobalVersion} - getAdditionalComponents={ + getAdditionalModules={ simulateGetAdditionalComponents } onEquipmentLabellingClick={ diff --git a/src/components/TopBar/AboutDialog.js b/src/components/TopBar/AboutDialog.js index 6e69d546..aa6ac414 100644 --- a/src/components/TopBar/AboutDialog.js +++ b/src/components/TopBar/AboutDialog.js @@ -246,6 +246,9 @@ const AboutDialog = ({ //dunno why the have the background as black in dark mode bgcolor: 'unset', }, + '.MuiAccordionSummary-content > .MuiSvgIcon-root': { + marginRight: '0.5rem', + }, }} > {/* TODO found how to scroll only in this section, to keep logo and global version always visible */} @@ -291,7 +294,12 @@ const AboutDialog = ({ {loadingAdditionalModules ? ( - + ) : ( diff --git a/src/components/TopBar/TopBar.js b/src/components/TopBar/TopBar.js index 4dd54848..28316df4 100644 --- a/src/components/TopBar/TopBar.js +++ b/src/components/TopBar/TopBar.js @@ -169,7 +169,7 @@ const TopBar = ({ appsAndUrls, onAboutClick, getGlobalVersion, - getAdditionalComponents, + getAdditionalModules, onThemeClick, theme, onEquipmentLabellingClick, @@ -754,7 +754,7 @@ const TopBar = ({ appVersion={appVersion} appLicense={appLicense} getGlobalVersion={getGlobalVersion} - getAdditionalComponents={getAdditionalComponents} + getAdditionalModules={getAdditionalModules} /> @@ -777,7 +777,7 @@ TopBar.propTypes = { theme: PropTypes.string, onAboutClick: PropTypes.func, getGlobalVersion: PropTypes.func, - getAdditionalComponents: PropTypes.func, + getAdditionalModules: PropTypes.func, onEquipmentLabellingClick: PropTypes.func, equipmentLabelling: PropTypes.bool, withElementsSearch: PropTypes.bool,