diff --git a/src/components/Sidebar/index.tsx b/src/components/Sidebar/index.tsx index bb45bc03..e3cff5af 100644 --- a/src/components/Sidebar/index.tsx +++ b/src/components/Sidebar/index.tsx @@ -150,7 +150,7 @@ const StyledSidebar = styled.div<{ expanded?: boolean; theme: IReqoreTheme }>` background-color: ${({ theme }) => theme.sidebar?.item?.activeBackground || theme.sidebar?.item?.background || - darken(0.08, getMainColor(theme, 'sidebar'))}; + darken(0.06, getMainColor(theme, 'sidebar'))}; span.bp3-icon:not(.favorite) { color: ${({ theme }) => @@ -170,7 +170,7 @@ const StyledSidebar = styled.div<{ expanded?: boolean; theme: IReqoreTheme }>` background-color: ${({ theme }) => theme.sidebar?.subItem?.activeBackground || theme.sidebar?.subItem?.background || - darken(0.1, getMainColor(theme, 'sidebar'))}; + darken(0.08, getMainColor(theme, 'sidebar'))}; span.bp3-icon:not(.favorite) { color: ${({ theme }) => theme.sidebar?.icon?.activeColor || @@ -206,7 +206,7 @@ const StyledSidebar = styled.div<{ expanded?: boolean; theme: IReqoreTheme }>` border-top: 1px solid ${({ theme }) => theme.sidebar?.item?.border || - darken(0.05, getMainColor(theme, 'sidebar'))}; + darken(0.04, getMainColor(theme, 'sidebar'))}; } &:hover { @@ -234,7 +234,7 @@ const StyledSidebar = styled.div<{ expanded?: boolean; theme: IReqoreTheme }>` border-left: 5px solid ${({ theme }) => theme.sidebar?.subItem?.border || - darken(0.08, getMainColor(theme, 'sidebar'))}; + darken(0.05, getMainColor(theme, 'sidebar'))}; } .sidebarSubItem, @@ -243,7 +243,7 @@ const StyledSidebar = styled.div<{ expanded?: boolean; theme: IReqoreTheme }>` background-color: ${({ theme }) => theme.sidebar?.subItem?.background || - darken(0.05, getMainColor(theme, 'sidebar'))}; + darken(0.04, getMainColor(theme, 'sidebar'))}; &:not(:first-child) { border-top: 1px solid @@ -260,7 +260,7 @@ const StyledSidebar = styled.div<{ expanded?: boolean; theme: IReqoreTheme }>` background-color: ${({ theme }) => theme.sidebar?.subItem?.hoverBackground || theme.sidebar?.subItem?.background || - darken(0.08, getMainColor(theme, 'sidebar'))}; + darken(0.06, getMainColor(theme, 'sidebar'))}; span.bp3-icon:not(.favorite) { color: ${({ theme }) => @@ -293,16 +293,13 @@ const StyledDivider = styled.div<{ theme?: any }>` display: flex; justify-content: center; align-items: center; - - &:first-child { - letter-spacing: 1.5px; - margin-top: 0; - padding: 0.5px; - } + letter-spacing: 1.5px; + margin-top: 0; + padding: 0.5px; background-color: ${({ theme }) => theme.sidebar?.section?.background || - darken(0.15, getMainColor(theme, 'sidebar'))}; + darken(0.04, getMainColor(theme, 'sidebar'))}; color: inherit; `; @@ -365,36 +362,37 @@ const QorusSidebar: React.FC = ({ {map(menu, ({ title, items }, sectionId: string) => size(items) ? ( -
+ <> {!_isCollapsed ? title || '' : ''} - {map(items, (itemData, key) => ( - - ))} -
+
+ {map(items, (itemData, key) => ( + + ))} +
+ ) : null )}
+