diff --git a/apps/charterafrica/src/components/Tool/Contributors.js b/apps/charterafrica/src/components/Tool/Contributors.js index 48f43ac9a..e88001762 100644 --- a/apps/charterafrica/src/components/Tool/Contributors.js +++ b/apps/charterafrica/src/components/Tool/Contributors.js @@ -12,7 +12,7 @@ const Contributors = React.forwardRef(function Contributors(props, ref) { return ( - + {title} diff --git a/apps/charterafrica/src/components/Tool/DescriptionAndShare.js b/apps/charterafrica/src/components/Tool/DescriptionAndShare.js index 8cb6a76db..cd49706b6 100644 --- a/apps/charterafrica/src/components/Tool/DescriptionAndShare.js +++ b/apps/charterafrica/src/components/Tool/DescriptionAndShare.js @@ -7,7 +7,7 @@ import ShareThisPage from "@/charterafrica/components/ShareThisPage"; const DescriptionAndShare = React.forwardRef( function DescriptionAndShare(props, ref) { - const { sx, description, lastActive } = props; + const { sx, description, lastActive, activeText } = props; return ( - {lastActive} + {activeText} {lastActive} - + - {lastCommit.committedDate - ? formatDateTime(lastCommit.committedDate, { - includeTime: false, - }) - : "-"} + {lastCommit.committedDate || "-"} {commitText} diff --git a/apps/charterafrica/src/components/Tool/OrgThemeAndOperatingCountries.js b/apps/charterafrica/src/components/Tool/OrgThemeAndOperatingCountries.js index 4e9b3a2a2..93734db76 100644 --- a/apps/charterafrica/src/components/Tool/OrgThemeAndOperatingCountries.js +++ b/apps/charterafrica/src/components/Tool/OrgThemeAndOperatingCountries.js @@ -13,34 +13,70 @@ const OrgThemeAndOperatingCountries = React.forwardRef( } return ( -
+
+ + - - {organisation.name} - - {theme ? ( - - ) : null} + {organisation.name} + + + + {theme ? ( + + ) : null} + {countries} diff --git a/apps/charterafrica/src/components/Tool/Partners.js b/apps/charterafrica/src/components/Tool/Partners.js index 78addc654..40942eaec 100644 --- a/apps/charterafrica/src/components/Tool/Partners.js +++ b/apps/charterafrica/src/components/Tool/Partners.js @@ -14,7 +14,7 @@ const Partners = React.forwardRef(function Partners(props, ref) { return ( - + {title} - + {title}
diff --git a/apps/charterafrica/src/components/Tool/Tool.js b/apps/charterafrica/src/components/Tool/Tool.js index 8efebe559..df1bb532d 100644 --- a/apps/charterafrica/src/components/Tool/Tool.js +++ b/apps/charterafrica/src/components/Tool/Tool.js @@ -6,6 +6,7 @@ import React from "react"; import ExternalLink from "@/charterafrica/assets/icons/Type=external-link, Size=24, Color=CurrentColor.svg"; import GithubIcon from "@/charterafrica/assets/icons/Type=github, Size=24, Color=CurrentColor.svg"; +import LineClampedRichTypography from "@/charterafrica/components/LineClampedRichTypography"; import Contributors from "@/charterafrica/components/Tool/Contributors"; import DescriptionAndShare from "@/charterafrica/components/Tool/DescriptionAndShare"; import Metrics from "@/charterafrica/components/Tool/Metrics"; @@ -22,7 +23,7 @@ const Tool = React.forwardRef(function Tool(props, ref) { theme, operatingCountries, description, - lastCommit, + lastActive, goToRepo, techSkills, contributors, @@ -35,12 +36,14 @@ const Tool = React.forwardRef(function Tool(props, ref) { toolsTitle, externalLink, classification, + activeText, + collectionText, } = props; return (
- + - + - + {name} - + {externalLink?.href ? ( - + @@ -100,16 +107,19 @@ const Tool = React.forwardRef(function Tool(props, ref) { ({ borderLeft: `1px solid rgba(0, 0, 0, 0.1)`, textAlign: { sm: "right", xs: "center" }, - pl: { sm: 6.25 }, + px: { sm: 6.25, xs: 2 }, })} >