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

[Tm-1653] Update design minitored charts labels #818

Merged
merged 3 commits into from
Jan 21, 2025
Merged

[Tm-1653] Update design minitored charts labels #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed8d403
[TM-1653] Design Clean-Up: Monitoring Indicator - Tree Cover Loss & T…
dottyy Jan 21, 2025
8268ba8
Merge branch 'staging' of https://github.com/wri/wri-terramatch-websi…
dottyy Jan 21, 2025
65c296a
[TM-1653] update style in charts and labels
dottyy Jan 21, 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
2 changes: 1 addition & 1 deletion src/admin/components/ResourceTabs/InformationTab/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ const InformationTab: FC<IProps> = props => {
props.type === "project-reports"
}
>
<div className="flex flex-col gap-11">
<div className="flex flex-col gap-4">
<ContextCondition frameworksHide={[Framework.PPC]}>
<div className="flex flex-col gap-4">
<div className="flex items-center gap-1 py-8">
Expand Down
2 changes: 1 addition & 1 deletion src/admin/components/ResourceTabs/MonitoredTab/components/MonitoredCharts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const MonitoredCharts = ({
title="Hectares Under Restoration By Target Land Use System"
data={landUseData.graphicTargetLandUseTypes}
maxValue={totalHectaresRestoredGoal}
className="pl-8"
className="pt-8 pl-8 lg:pt-9 wide:pt-10"
/>
</div>
</ChartContainer>
Expand Down
3 changes: 2 additions & 1 deletion src/components/extensive/Tables/TreeSpeciesTablePD.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const TreeSpeciesTablePD = ({
result = modelName === "project" ? "noGoal" : "treeCount/Goal";
}
if (collection === "seeding") {
result = modelName === "project" ? "noGoal" : "seedCount/Goal";
result = "noGoal";
}
if (collection === "tree-planted") {
result =
Expand Down Expand Up @@ -369,6 +369,7 @@ const TreeSpeciesTablePD = ({
accessorKey: "treeCount",
header: "Count",
enableSorting: false,
meta: { width: secondColumnWidth },
cell: (props: any) => {
const value = props.getValue();
return (
Expand Down
4 changes: 2 additions & 2 deletions src/styles/custom-admin-page-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,15 @@
}

.MuiInputBase-root .MuiTablePagination-select {
@apply w-[70px] flex !py-0 items-center gap-4 !pl-5 !pr-0 bg-white focus:bg-white order-1 rounded-l-lg after:block after:content-[''] after:bg-primary-300 after:rounded-r-lg after:w-11 after:h-12
@apply w-[70px] flex !py-0 items-center gap-2 !pl-5 !pr-0 bg-white focus:bg-white order-1 rounded-l-lg after:block after:content-[''] after:bg-primary-300 after:rounded-r-lg after:w-11 after:h-12
}

.MuiInputBase-root .MuiTablePagination-select+input {
@apply h-11 w-11
}

.MuiTablePagination-selectIcon {
@apply !right-3
@apply !right-[6%]
}

.MuiTablePagination-selectLabel {
Expand Down
Loading