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

OLMIS-7903: Adjust BUQ colours with core UI and fix displaying distri… #35

Merged
merged 1 commit into from
Mar 15, 2024
Merged

OLMIS-7903: Adjust BUQ colours with core UI and fix displaying distri… #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/buq/_buq.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

.category-row {
td {
background: linear-gradient(to bottom, #1eb2bb, #1b9da5 10%, #17888F);
color: white;
background-color: #3A95BC;
color: #fff;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/buq/components/approveBuq/ApproveBuq.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ const ApproveBuq = ({
accessor: "id",
Cell: ({ value }) => (
<Link to={`/buq/approve/${value}`}>
<ResponsiveButton className="proceed">
<ResponsiveButton className="primary">
<span>View</span>
</ResponsiveButton>
</Link>
Expand Down
2 changes: 1 addition & 1 deletion src/buq/components/createAuthorizeForecasting/CreateAuthorizeForecasting.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ const CreateAuthorizeForecasting = ({ loadingModalService }) => {
Cell: ({ value, row }) => {
return (
<ResponsiveButton
className='proceed'
className='primary'
onClick={() =>
checkRightsAndProceed(row.original.status, value)
}
Expand Down
13 changes: 8 additions & 5 deletions src/buq/components/createAuthorizeForecasting/_createAuthorizeForecasting.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
}

.proceed {
padding: 8px 16px;
border-radius: 4px;
border: 1px solid $brand-blue;
background: $brand-blue;
color: #FFF;
text-shadow: 0 0 0.1em #333;
background-image: linear-gradient(to bottom, #1eb2bb, #1b9da5 10%, #17888F);
border-top: #3A95BC 1px solid;
border-right: #3A95BC 1px solid;
border-left: #3A95BC 1px solid;
border-bottom: #3A95BC 1px solid;
color: #fff;
text-shadow: 0px 0px 0.1em #333;
background: #3A95BC linear-gradient(to bottom, #5cabcd, #49a1c7 10%, #3A95BC);

&:hover {
background-image: none;
Expand Down
2 changes: 1 addition & 1 deletion src/react-hooks/useGeographicZoneGroup.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const useGeographicZoneGroup = () => {
const region = allGeographicZone?.find((reg) => reg.id === item.value);
return {
...item,
name: `${region?.name} - ${region?.level.name}` || '',
name: `${region?.name} - ${region?.level.code}` || '',
};
});
setGeographicZoneParams(newResult);
Expand Down
Loading