Merge branch 'master' into branded-theme

Signed-off-by: Aabid Sofi <[email protected]>

Author: aabidsofi19

src/custom/CollaboratorAvatarGroup/CollaboratorAvatarGroup.tsx

@@ -1,6 +1,6 @@
 import { ExpandMore } from '@mui/icons-material';
 import { MouseEvent, useState } from 'react';
-import { Avatar, AvatarGroup, Button, Popover, Typography, Divider } from '../../base';
+import { Avatar, AvatarGroup, Button, Divider, Popover, Typography } from '../../base';
 import { iconSmall } from '../../constants/iconsSizes';
 import { styled, useTheme } from '../../theme';
 import { DARK_TEAL_BLUE } from '../../theme/colors/colors';
@@ -144,9 +144,33 @@ const CollaboratorAvatarGroup = ({
           return (
             <CustomTooltip
               key={clientID}
+              componentsProps={{
+                tooltip: {
+                  sx: {
+                    background: theme.palette.background.paper,
+                    color: theme.palette.text.primary,
+                    boxShadow: theme.shadows[4]
+                  }
+                },
+                arrow: {
+                  sx: {
+                    color: theme.palette.background.paper
+                  }
+                }
+              }}
               title={
                 <div style={{ display: 'flex', justifyContent: 'center', flexDirection: 'column' }}>
-                  <Typography style={{ display: 'flex', justifyContent: 'center', flexDirection: 'column', margin: 'auto', fontSize: '1rem' }}>{user.name}</Typography>
+                  <Typography
+                    style={{
+                      display: 'flex',
+                      justifyContent: 'center',
+                      flexDirection: 'column',
+                      margin: 'auto',
+                      fontSize: '1rem'
+                    }}
+                  >
+                    {user.name}
+                  </Typography>
                   <Divider />
                   <Button
                     size="small"
@@ -156,7 +180,7 @@ const CollaboratorAvatarGroup = ({
                       fontSize: '1rem',
                       padding: '2px 8px',
                       minWidth: 'auto',
-                      marginTop: '4px'
+                      marginTop: '8px'
                     }}
                   >
                     Open Recents

src/theme/theme.ts

@@ -8,8 +8,6 @@ import _ from 'lodash';
 export const drawerWidth = 240;
 
 
-
-
 /**
  * Primitive palette defines the raw, brand-level colors used in the UI.
  * These are foundational tokens that never directly appear in components
@@ -323,4 +321,5 @@ export const createCustomTheme = (mode: PaletteMode, primitives?: PrimitivePalet
         typography: typography(mode),
         breakpoints: {}
     });
+
 };