JNG-5425 fix layout issues

BlackBeltTechnology · Jan 17, 2024 · 157043a · 157043a
1 parent cdd9b51
commit 157043a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/divider.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/divider.hbs
@@ -14,7 +14,9 @@
     <Grid container sx={ { height: DIVIDER_HEIGHT } } alignItems="center">
         <Grid item xs={12}>
             <Divider id="{{ getXMIID child }}">
+                {{# or child.icon child.label }}
                 <Box sx={ { display: 'flex', flexDirection: 'row', alignItems: 'center' } }>
+                {{/ or }}
                     {{# if child.icon }}
                     <MdiIcon path="{{ child.icon.iconName }}" {{# if child.label }}sx={ { mr: '.2rem' } }{{/ if }} />
                     {{/ if }}
@@ -23,7 +25,9 @@
                         { t('{{ getTranslationKeyForVisualElement child }}', { defaultValue: '{{ child.label }}' }) as string }
                     </Typography>
                     {{/ if }}
+                {{# or child.icon child.label }}
                 </Box>
+                {{/ or }}
             </Divider>
         </Grid>
     </Grid>

diff --git a/...t/src/main/resources/actor/src/layout/Drawer/DrawerContent/Navigation/NavCollapse.tsx.hbs b/...t/src/main/resources/actor/src/layout/Drawer/DrawerContent/Navigation/NavCollapse.tsx.hbs
@@ -127,7 +127,7 @@ export const NavCollapse = ({ menu, level, parentId }: NavCollapseProps) => {
             {...(miniDrawer && { onMouseEnter: handleClick, onMouseLeave: handleClose })}
             onClick={handleClick}
             sx={ {
-              pl: !miniDrawer ? `${level * 24}px` : 1.5,
+              pl: !miniDrawer ? `${level * 1.5}rem` : 1.5,
               py: miniDrawer && level === 1 ? 1.25 : 1,
               '&:hover': {
                 bgcolor: miniDrawer ? 'transparent' : theme.palette.mode === ThemeMode.DARK ? 'divider' : 'primary.lighter',

diff --git a/...react/src/main/resources/actor/src/layout/Drawer/DrawerContent/Navigation/NavItem.tsx.hbs b/...react/src/main/resources/actor/src/layout/Drawer/DrawerContent/Navigation/NavItem.tsx.hbs
@@ -81,7 +81,7 @@ export const NavItem = ({ item, level }: NavItemProps) => {
             disabled={item.disabled}
             sx={ {
               zIndex: 1201,
-              pl: !miniDrawer ? `${level * iconWidth}px` : borderRadius,
+              pl: !miniDrawer ? `${level * 1.5}rem` : borderRadius,
               py: miniDrawer && level === 1 ? 1.25 : 1,
               '&:hover': {
                 bgcolor: theme.palette.mode === ThemeMode.DARK ? 'divider' : 'primary.lighter',