Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PSP-9491 | Header Layout improvements #4682

Open
wants to merge 4 commits into
base: test
Choose a base branch
from
Open

PSP-9491 | Header Layout improvements #4682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddbd511
Header Layout improvements
FuriousLlama Mar 6, 2025
520f6d4
Merge
FuriousLlama Mar 6, 2025
5b5c427
Merge
FuriousLlama Mar 6, 2025
113f0d7
Merge branch 'test' into features/psp-9491
FuriousLlama Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
266 changes: 135 additions & 131 deletions .../frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions source/frontend/src/features/mapSideBar/acquisition/common/AcquisitionHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { formatMinistryProject } from '@/utils/formUtils';

import HistoricalNumbersContainer from '../../shared/header/HistoricalNumberContainer';
import { HistoricalNumberSectionView } from '../../shared/header/HistoricalNumberSectionView';
import { StyledLeftHeaderPane } from '../../shared/header/styles';

export interface IAcquisitionHeaderProps {
acquisitionFile?: ApiGen_Concepts_AcquisitionFile;
Expand All @@ -27,7 +28,7 @@ export const AcquisitionHeader: React.FunctionComponent<

return (
<StyledRow className="no-gutters">
<Col xs="8">
<StyledLeftHeaderPane xs="8">
<HeaderField label="File:" labelWidth={leftColumnLabel} contentWidth="9">
{acquisitionFile?.fileNumber} - {acquisitionFile?.fileName}
</HeaderField>
Expand All @@ -50,7 +51,7 @@ export const AcquisitionHeader: React.FunctionComponent<
)}
</HeaderField>
<HistoricalNumbersContainer propertyIds={propertyIds} View={HistoricalNumberSectionView} />
</Col>
</StyledLeftHeaderPane>
<Col>
<StyledFiller>
<AuditSection lastUpdatedBy={lastUpdatedBy} baseAudit={acquisitionFile} />
Expand Down
26 changes: 15 additions & 11 deletions .../src/features/mapSideBar/acquisition/common/__snapshots__/AcquisitionHeader.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ exports[`AcquisitionHeader component > renders as expected when no data is provi
class="Toastify"
/>
<div />
.c3 {
.c4 {
font-size: 0.87em;
line-height: 1.9;
}

.c1 {
.c2 {
font-weight: bold;
white-space: nowrap;
}
Expand All @@ -24,7 +24,7 @@ exports[`AcquisitionHeader component > renders as expected when no data is provi
border-bottom-width: 0.1rem;
}

.c2 {
.c3 {
height: 100%;
display: -webkit-box;
display: -webkit-flex;
Expand All @@ -35,11 +35,15 @@ exports[`AcquisitionHeader component > renders as expected when no data is provi
flex-direction: column;
}

.c1 {
max-width: 60rem;
}

<div
class="c0 no-gutters row"
>
<div
class="col-8"
class="c1 col-8"
>
<div
class="row"
Expand All @@ -48,7 +52,7 @@ exports[`AcquisitionHeader component > renders as expected when no data is provi
class="pr-0 text-left col-3"
>
<label
class="c1"
class="c2"
>
File:
</label>
Expand All @@ -66,7 +70,7 @@ exports[`AcquisitionHeader component > renders as expected when no data is provi
class="pr-0 text-left col-3"
>
<label
class="c1"
class="c2"
>
Ministry project:
</label>
Expand All @@ -82,7 +86,7 @@ exports[`AcquisitionHeader component > renders as expected when no data is provi
class="pr-0 text-left col-3"
>
<label
class="c1"
class="c2"
>
Ministry product:
</label>
Expand All @@ -99,7 +103,7 @@ exports[`AcquisitionHeader component > renders as expected when no data is provi
class="pr-0 text-left col-3"
>
<label
class="c1"
class="c2"
>
Historical file #:
</label>
Expand All @@ -113,7 +117,7 @@ exports[`AcquisitionHeader component > renders as expected when no data is provi
class="col"
>
<div
class="c2"
class="c3"
>
<div
class="no-gutters row"
Expand All @@ -122,7 +126,7 @@ exports[`AcquisitionHeader component > renders as expected when no data is provi
class="text-right col"
>
<span
class="c3"
class="c4"
>
<strong>
Created:
Expand All @@ -147,7 +151,7 @@ exports[`AcquisitionHeader component > renders as expected when no data is provi
class="text-right col"
>
<span
class="c3"
class="c4"
>
<strong>
Updated:
Expand Down
Loading
Loading