Skip to content

Commit

Permalink
Merge branch 'OCD-4700' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
mattystank committed Mar 5, 2025
2 parents 19be6ee + 18fc257 commit 3e99c04
Showing 1 changed file with 16 additions and 13 deletions.
29 changes: 16 additions & 13 deletions src/app/components/developer/developer-view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,16 @@ const useStyles = makeStyles({
gridTemplateColumns: '1fr 1fr',
gap: '16px',
},
historyContent: {
display: 'grid',
padding: '4px',
},
developerHeader: {
margin: '0',
fontSize: '1.25em',
},
developerHeaderContainer: {
maxWidth: '75%',
},
fullWidth: {
gridColumn: '1 / -1',
},
headerContainer: {
display: 'flex',
alignItems: 'center',
Expand All @@ -60,6 +62,15 @@ const useStyles = makeStyles({
headerTitle: {
margin: 0,
},
historyContent: {
display: 'grid',
padding: '4px',
},
MuiAccordionroot: {
'&.MuiAccordion-root:before': {
backgroundColor: 'transparent',
},
},
statusHistorySummary: {
backgroundColor: '#fff',
boxShadow: 'none',
Expand All @@ -72,14 +83,6 @@ const useStyles = makeStyles({
fontWeight: 'bold',
marginTop: '8px',
},
fullWidth: {
gridColumn: '1 / -1',
},
MuiAccordionroot: {
'&.MuiAccordion-root:before': {
backgroundColor: 'transparent',
},
},
});

const isActive = (statuses) => !statuses || statuses.length === 0 || statuses.every((status) => status.endDate);
Expand Down Expand Up @@ -252,7 +255,7 @@ function ChplDeveloperView(props) {
<CardHeader
title={(
<div className={classes.headerContainer}>
{isSplitting ? 'Original Developer' : developer.name}
<div className={classes.developerHeaderContainer}>{isSplitting ? 'Original Developer' : developer.name}</div>
{ can('edit') && !hasAnyRole(['chpl-developer'])
&& (
<ChplOrganizationActivity
Expand Down

0 comments on commit 3e99c04

Please sign in to comment.