diff --git a/packages/components-faraday/src/components/Dashboard/DashboardCard.js b/packages/components-faraday/src/components/Dashboard/DashboardCard.js index 93b58060a3bdf80abefaedcbe66cd3d950c921d7..82f9a8698c43046994924dcc4e59c40b0a313043 100644 --- a/packages/components-faraday/src/components/Dashboard/DashboardCard.js +++ b/packages/components-faraday/src/components/Dashboard/DashboardCard.js @@ -59,45 +59,45 @@ const DashboardCard = ({ title={title} dangerouslySetInnerHTML={{ __html: title }} // eslint-disable-line /> - </LeftDetails> - <RightDetails flex={2}> - {canMakeDecision && ( - <Decision - collectionId={project.id} - fragmentId={version.id} - modalKey={`decide-${version.id}`} - /> - )} - {canMakeRecommendation && ( - <Recommendation + <RightDetails flex="none"> + {canMakeDecision && ( + <Decision + collectionId={project.id} + fragmentId={version.id} + modalKey={`decide-${version.id}`} + /> + )} + {canMakeRecommendation && ( + <Recommendation + collectionId={project.id} + fragmentId={version.id} + modalKey={`recommend-${version.id}`} + /> + )} + <ZipFiles + archiveName={`ID-${project.customId}`} collectionId={project.id} + disabled={!hasFiles} fragmentId={version.id} - modalKey={`recommend-${version.id}`} - /> - )} - <ZipFiles - archiveName={`ID-${project.customId}`} - collectionId={project.id} - disabled={!hasFiles} - fragmentId={version.id} - > - <ClickableIcon disabled={!hasFiles}> - <Icon>download</Icon> - </ClickableIcon> - </ZipFiles> - {!project.status && ( - <ActionButtons - data-test="button-resume-submission" - onClick={() => - history.push( - `/projects/${project.id}/versions/${version.id}/submit`, - ) - } > - RESUME SUBMISSION - </ActionButtons> - )} - </RightDetails> + <ClickableIcon disabled={!hasFiles}> + <Icon>download</Icon> + </ClickableIcon> + </ZipFiles> + {!project.status && ( + <ActionButtons + data-test="button-resume-submission" + onClick={() => + history.push( + `/projects/${project.id}/versions/${version.id}/submit`, + ) + } + > + RESUME SUBMISSION + </ActionButtons> + )} + </RightDetails> + </LeftDetails> </Top> <Bottom> <LeftDetails flex={3}> @@ -215,6 +215,7 @@ const ActionButtons = styled(Button)` height: calc(${th('subGridUnit')} * 5); padding: calc(${th('subGridUnit')} / 2) ${th('subGridUnit')}; text-align: center; + white-space: nowrap; ` const LeftDetails = styled.div` @@ -336,6 +337,7 @@ const Title = styled.div` white-space: nowrap; overflow: hidden; flex: 10; + padding-right: ${th('subGridUnit')}; ` const Status = styled.div` diff --git a/packages/components-faraday/src/components/MakeDecision/Decision.js b/packages/components-faraday/src/components/MakeDecision/Decision.js index a3a3b3b57f7b96f5cd33ab59990cd148fff55152..cf4279e1615dc66ec08c8deb6cd8fab98ca16207 100644 --- a/packages/components-faraday/src/components/MakeDecision/Decision.js +++ b/packages/components-faraday/src/components/MakeDecision/Decision.js @@ -58,5 +58,6 @@ const Root = styled.div` justify-content: center; padding: 0 calc(${th('subGridUnit')} * 2); text-transform: uppercase; + white-space: nowrap; ` // #endregion diff --git a/packages/components-faraday/src/components/MakeRecommendation/Recommendation.js b/packages/components-faraday/src/components/MakeRecommendation/Recommendation.js index 22fd9321be9b047bfef9283f7a11f13e2510f5c8..10d7fc6d98a6a1f1ce932aa5b6622015eee59530 100644 --- a/packages/components-faraday/src/components/MakeRecommendation/Recommendation.js +++ b/packages/components-faraday/src/components/MakeRecommendation/Recommendation.js @@ -59,5 +59,6 @@ const Root = styled.div` min-width: 200px; padding: 0 calc(${th('subGridUnit')} * 2); text-transform: uppercase; + white-space: nowrap; ` // #endregion