From f13290ccf1b77f49554bfd44790ff5ef76eee24a Mon Sep 17 00:00:00 2001 From: Thomas Heartman Date: Thu, 19 Jun 2025 12:53:18 +0200 Subject: [PATCH] make some small changes to get started --- .../Changes/Change/SegmentChange.tsx | 2 +- .../Changes/FeatureToggleChanges.tsx | 61 ++++++++++--------- .../ChangeRequestHeader.tsx | 2 +- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChange.tsx index fadd3b334f..0c3d13b6ce 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChange.tsx @@ -52,7 +52,7 @@ export const SegmentChange: FC = ({ px: 3, }} > - Segment name: + Segment: prop !== 'conflict', +})<{ conflict?: string }>(({ theme, conflict }) => ({ + display: 'flex', + paddingTop: theme.spacing(conflict ? 0 : 2), + paddingBottom: theme.spacing(2), + paddingInline: theme.spacing(3), +})); + export const FeatureToggleChanges: FC = ({ featureName, projectId, @@ -28,9 +37,7 @@ export const FeatureToggleChanges: FC = ({ > ({ - backgroundColor: conflict - ? theme.palette.neutral.light - : theme.palette.neutral.light, + backgroundColor: theme.palette.neutral.light, borderRadius: (theme) => `${theme.shape.borderRadiusLarge}px ${theme.shape.borderRadiusLarge}px 0 0`, border: '1px solid', @@ -43,32 +50,26 @@ export const FeatureToggleChanges: FC = ({ })} > - - Feature flag name: - - - {featureName} - - + + Feature flag: + + + {featureName} + + + {children} diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx index 25c3b19940..9563c1df3e 100644 --- a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx +++ b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx @@ -26,7 +26,7 @@ export const ChangeRequestHeader: FC<{ changeRequest: ChangeRequestType }> = ({ title={title} setTitle={setTitle} > - + {title}