diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenu.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenu.tsx index 3804571afa..57368f83d0 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenu.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenu.tsx @@ -248,6 +248,7 @@ export const FeatureStrategyMenu = ({ PaperProps={{ sx: { borderRadius: '12px', + height: newStrategyModalEnabled ? '100%' : 'auto', }, }} > diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenuCards/FeatureStrategyMenuCards.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenuCards/FeatureStrategyMenuCards.tsx index 518fe63820..3128d45256 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenuCards/FeatureStrategyMenuCards.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenuCards/FeatureStrategyMenuCards.tsx @@ -45,7 +45,7 @@ const StyledContainer = styled(Box)(() => ({ const StyledScrollableContent = styled(Box)(({ theme }) => ({ width: theme.breakpoints.values.md, - height: theme.spacing(52), + height: '100%', overflowY: 'auto', padding: theme.spacing(4), paddingTop: theme.spacing(2), diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanReviewDialog.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanReviewDialog.tsx index 5f738842e2..e3bf6d2724 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanReviewDialog.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanReviewDialog.tsx @@ -19,10 +19,18 @@ import CloseIcon from '@mui/icons-material/Close'; const StyledDialog = styled(Dialog)(({ theme }) => ({ '& .MuiDialog-paper': { borderRadius: theme.shape.borderRadiusLarge, - width: theme.breakpoints.values.md, + height: '100%', }, })); +const StyledScrollableContent = styled(Box)(({ theme }) => ({ + width: theme.breakpoints.values.md, + height: '100%', + overflowY: 'auto', + display: 'flex', + flexDirection: 'column', +})); + const StyledHeader = styled(Box)(({ theme }) => ({ display: 'flex', justifyContent: 'space-between', @@ -104,30 +112,35 @@ export const ReleasePlanReviewDialog = ({ Go back - {activeReleasePlan && ( - - - This feature environment currently has{' '} - {activeReleasePlan.name} -{' '} - {activeReleasePlan.milestones[0].name} - {environmentEnabled ? ' running' : ' paused'}. Adding a - new release plan will replace the existing release plan. - + + {activeReleasePlan && ( + + + This feature environment currently has{' '} + {activeReleasePlan.name} -{' '} + + {activeReleasePlan.milestones[0].name} + + {environmentEnabled ? ' running' : ' paused'}. + Adding a new release plan will replace the existing + release plan. + + + )} + + - )} - - - - {crProtected && ( - - - Adding release template{' '} - {template?.name} to{' '} - {featureName} in{' '} - {environment}. - - - )} + {crProtected && ( + + + Adding release template{' '} + {template?.name} to{' '} + {featureName} in{' '} + {environment}. + + + )} +