From 543bb0d819b885f42b212f16fec526e3c4a7115b Mon Sep 17 00:00:00 2001 From: Bonsai8863 <131906254+Bonsai8863@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:24:46 -0400 Subject: [PATCH] [frontend/backend] Made top-level left nav text bolder and changed transparency of selected items; default to no submenu icons --- opencti-platform/opencti-front/src/components/ThemeDark.ts | 2 ++ opencti-platform/opencti-front/src/components/ThemeLight.ts | 4 ++-- .../opencti-front/src/private/components/nav/LeftBar.jsx | 2 +- opencti-platform/opencti-graphql/src/resolvers/user.js | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/opencti-platform/opencti-front/src/components/ThemeDark.ts b/opencti-platform/opencti-front/src/components/ThemeDark.ts index 6ce5ea3268e69..21f1573cb4ee9 100644 --- a/opencti-platform/opencti-front/src/components/ThemeDark.ts +++ b/opencti-platform/opencti-front/src/components/ThemeDark.ts @@ -290,9 +290,11 @@ const ThemeDark = ( root: { '&.Mui-selected': { boxShadow: `2px 0 ${primary || THEME_DARK_DEFAULT_PRIMARY} inset`, + backgroundColor: `${hexToRGB(primary || THEME_DARK_DEFAULT_PRIMARY, 0.24)}`, }, '&.Mui-selected:hover': { boxShadow: `2px 0 ${primary || THEME_DARK_DEFAULT_PRIMARY} inset`, + backgroundColor: `${hexToRGB(primary || THEME_DARK_DEFAULT_PRIMARY, 0.32)}`, }, }, }, diff --git a/opencti-platform/opencti-front/src/components/ThemeLight.ts b/opencti-platform/opencti-front/src/components/ThemeLight.ts index a261e0483c54a..40b0ab496114e 100644 --- a/opencti-platform/opencti-front/src/components/ThemeLight.ts +++ b/opencti-platform/opencti-front/src/components/ThemeLight.ts @@ -294,11 +294,11 @@ const ThemeLight = ( }, '&.Mui-selected': { boxShadow: `2px 0 ${primary || THEME_LIGHT_DEFAULT_PRIMARY} inset`, - backgroundColor: hexToRGB(primary || THEME_LIGHT_DEFAULT_PRIMARY, 0.08), + backgroundColor: hexToRGB(primary || THEME_LIGHT_DEFAULT_PRIMARY, 0.12), }, '&.Mui-selected:hover': { boxShadow: `2px 0 ${primary || THEME_LIGHT_DEFAULT_PRIMARY} inset`, - backgroundColor: hexToRGB(primary || THEME_LIGHT_DEFAULT_PRIMARY, 0.12), + backgroundColor: hexToRGB(primary || THEME_LIGHT_DEFAULT_PRIMARY, 0.16), }, }, }, diff --git a/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx b/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx index 636313121b944..0bb5a7c5fe755 100644 --- a/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx +++ b/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx @@ -146,7 +146,7 @@ const useStyles = makeStyles((theme) => createStyles({ }, menuItemText: { padding: '1px 0 0 15px', - fontWeight: 500, + fontWeight: 600, fontSize: 14, }, menuSubItemText: { diff --git a/opencti-platform/opencti-graphql/src/resolvers/user.js b/opencti-platform/opencti-graphql/src/resolvers/user.js index 2c7724433ddb0..eb0200c81cf62 100644 --- a/opencti-platform/opencti-graphql/src/resolvers/user.js +++ b/opencti-platform/opencti-graphql/src/resolvers/user.js @@ -107,7 +107,7 @@ const userResolvers = { MeUser: { language: (current) => current.language ?? 'auto', unit_system: (current) => current.unit_system ?? 'auto', - submenu_show_icons: (current) => current.submenu_show_icons ?? true, + submenu_show_icons: (current) => current.submenu_show_icons ?? false, submenu_auto_collapse: (current) => current.submenu_auto_collapse ?? true, monochrome_labels: (current) => current.monochrome_labels ?? false, groups: (current, args, context) => userGroupsPaginated(context, context.user, current.id, args),