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

Jump to bottom

PSP-8002 : FT:UI/UX- Agreements: Agreement #(number) is not aligned a… #3855

Merged
merged 6 commits into from
Mar 11, 2024
Merged

PSP-8002 : FT:UI/UX- Agreements: Agreement #(number) is not aligned a… #3855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51edc9e
PSP-8002 : FT:UI/UX- Agreements: Agreement #(number) is not aligned a…
Mar 8, 2024
86d4e68
Merge branch 'dev' into psp-8002
asanchezr Mar 9, 2024
5430c1e
Merge branch 'dev' into psp-8002
asanchezr Mar 9, 2024
f007cbd
Merge branch 'dev' into psp-8002
asanchezr Mar 9, 2024
91f3e86
Merge branch 'dev' into psp-8002
Mar 11, 2024
e3ff325
Merge branch 'psp-8002' of https://github.com/eddherrera/PSP into psp…
Mar 11, 2024
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
19 changes: 13 additions & 6 deletions source/frontend/src/features/mapSideBar/acquisition/tabs/agreement/detail/AgreementView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import { Col, Row } from 'react-bootstrap';
import { FaMailBulk, FaPlus, FaTrash } from 'react-icons/fa';
import { useHistory, useRouteMatch } from 'react-router-dom';
import styled from 'styled-components';
Expand Down Expand Up @@ -65,9 +64,9 @@ export const AgreementView: React.FunctionComponent<IAgreementViewProps> = ({
<StyledAgreementBorder key={`agreement-section-${index}`}>
<Section
header={
<Row>
<Col md={5}>{`Agreement ${++index}`}</Col>
<Col md={7}>
<StyledHeaderContainer>
<div>{`Agreement ${++index}`}</div>
<div>
{exists(agreement.agreementType) && (
<StyledButtonContainer>
<StyledAddButton
Expand Down Expand Up @@ -130,8 +129,8 @@ export const AgreementView: React.FunctionComponent<IAgreementViewProps> = ({
)}
</StyledButtonContainer>
)}
</Col>
</Row>
</div>
</StyledHeaderContainer>
}
isCollapsable
initiallyExpanded
Expand Down Expand Up @@ -208,6 +207,14 @@ export const StyledButtonContainer = styled.div`
justify-content: flex-end;
align-items: center;
margin-bottom: 0.5rem;
align-items: center;
`;

const StyledHeaderContainer = styled.div`
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
`;

const StyledAgreementBorder = styled.div`
Expand Down
Loading
Loading