OpenConceptLab/ocl_issues#1776 | Member orgs styles

OpenConceptLab · Oct 2, 2024 · 49bc24f · 49bc24f
1 parent 95e1cab
commit 49bc24f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/components/orgs/OrgChip.jsx b/src/components/orgs/OrgChip.jsx
@@ -4,15 +4,16 @@ import BaseEntityChip from '../common/BaseEntityChip'
 import OrgTooltip from './OrgTooltip'
 
 
-const OrgChip = ({ org, noTooltip, ...rest }) => {
+const OrgChip = ({ org, noTooltip, tooltipProps, ...rest }) => {
+  let _tooltipProps = tooltipProps || {}
   return noTooltip ? (
     <BaseEntityChip
       entity={org}
       icon={<OrganizationIcon />}
       {...rest}
     />
   ) : (
-    <OrgTooltip org={org}>
+    <OrgTooltip org={org} {..._tooltipProps}>
       <BaseEntityChip
         entity={org}
         icon={<OrganizationIcon />}

diff --git a/src/components/orgs/OrgTooltip.jsx b/src/components/orgs/OrgTooltip.jsx
@@ -11,7 +11,7 @@ const TooltipTitle = ({ org }) => {
       <div style={{width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'space-between'}}>
         {
           org?.logo_url ?
-            <img src={org.logo_url} style={{width: '48px', height: '48px', border-radius: '50%', objectFit: 'cover'}} /> :
+            <img src={org.logo_url} style={{width: '48px', height: '48px', borderRadius: '50%', objectFit: 'cover'}} /> :
           <OrganizationIcon sx={{width: '30px', height: '30px'}} />
         }
         <FollowActionButton iconButton entity={org} sx={{mr: 0, ml: 1.5}} size='small' />

diff --git a/src/components/users/UserProfile.jsx b/src/components/users/UserProfile.jsx
@@ -99,7 +99,7 @@ const UserProfile = ({ user }) => {
               <div className='col-xs-12 padding-0' style={{marginTop: '8px', maxHeight: '300px', overflow: 'auto'}}>
                 {
                   userOrgs.map(org => (
-                    <OrgChip hideType key={org?.id} org={org} sx={{margin: '4px'}} />
+                    <OrgChip hideType key={org?.id} org={org} sx={{margin: '4px'}} tooltipProps={{spanStyle: {display: 'inline'}}} />
                   ))
                 }
               </div>

diff --git a/src/components/users/UserTooltip.jsx b/src/components/users/UserTooltip.jsx
@@ -11,7 +11,7 @@ const TooltipTitle = ({ user }) => {
       <div style={{width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'space-between'}}>
         {
           user?.logo_url ?
-            <img src={user.logo_url} style={{width: '48px', height: '48px', border-radius: '50%', objectFit: 'cover'}} /> :
+            <img src={user.logo_url} style={{width: '48px', height: '48px', borderRadius: '50%', objectFit: 'cover'}} /> :
           <UserIcon sx={{width: '30px', height: '30px'}} />
         }
         <FollowActionButton iconButton entity={user} sx={{mr: 0, ml: 1.5}} size='small' />