Skip to content

Commit

Permalink
review + fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Tristan-WorkGH committed Dec 8, 2023
1 parent 7894328 commit 97b32d4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion demo/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ const AppContent = ({ language, onLanguageClick }) => {
appVersion={AppPackage.version}
appLicense={AppPackage.license}
getGlobalVersion={simulateGetGlobalVersion}
getAdditionalComponents={
getAdditionalModules={
simulateGetAdditionalComponents
}
onEquipmentLabellingClick={
Expand Down
10 changes: 9 additions & 1 deletion src/components/TopBar/AboutDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 */}
Expand Down Expand Up @@ -291,7 +294,12 @@ const AboutDialog = ({
<AccordionDetails>
<Grid container sx={{ pl: 2 }} spacing={1}>
{loadingAdditionalModules ? (
<Grid item xs>
<Grid
item
xs
display="inline-flex"
justifyContent="center"
>
<CircularProgress color="inherit" />
</Grid>
) : (
Expand Down
6 changes: 3 additions & 3 deletions src/components/TopBar/TopBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ const TopBar = ({
appsAndUrls,
onAboutClick,
getGlobalVersion,
getAdditionalComponents,
getAdditionalModules,
onThemeClick,
theme,
onEquipmentLabellingClick,
Expand Down Expand Up @@ -754,7 +754,7 @@ const TopBar = ({
appVersion={appVersion}
appLicense={appLicense}
getGlobalVersion={getGlobalVersion}
getAdditionalComponents={getAdditionalComponents}
getAdditionalModules={getAdditionalModules}
/>
</Toolbar>
</AppBar>
Expand All @@ -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,
Expand Down

0 comments on commit 97b32d4

Please sign in to comment.