diff --git a/apps/climatemappedafrica/jsconfig.json b/apps/climatemappedafrica/jsconfig.json index aa87131a0..d997fd29f 100644 --- a/apps/climatemappedafrica/jsconfig.json +++ b/apps/climatemappedafrica/jsconfig.json @@ -2,11 +2,11 @@ "compilerOptions": { "baseUrl": ".", "paths": { + "@/climatemappedafrica/*": ["./src/*"], "@/commons-ui/core/*": ["../../packages/commons-ui-core/src/*"], "@/commons-ui/next/*": ["../../packages/commons-ui-next/src/*"], "@/hurumap/core/*": ["../../packages/hurumap-core/src/*"], - "@/hurumap/next/*": ["../../packages/hurumap-next/src/*"], - "@/climatemappedafrica/*": ["./src/*"] + "@/hurumap/next/*": ["../../packages/hurumap-next/src/*"] } }, "exclude": ["node_modules"] diff --git a/packages/hurumap-core/jsconfig.json b/packages/hurumap-core/jsconfig.json index ca68d630c..b3ec9724b 100644 --- a/packages/hurumap-core/jsconfig.json +++ b/packages/hurumap-core/jsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "@/hurumap/core/*": ["./src/*"] + "@/hurumap/core/*": ["src/*"] } }, "exclude": ["node_modules"] diff --git a/packages/hurumap-core/src/Location/Location.js b/packages/hurumap-core/src/Location/Location.js index 1444c9013..a9ecd95bb 100644 --- a/packages/hurumap-core/src/Location/Location.js +++ b/packages/hurumap-core/src/Location/Location.js @@ -1,66 +1,61 @@ -import { Box, Grid, styled, useTheme } from "@mui/material"; +import { Box, Grid, useTheme } from "@mui/material"; import { alpha } from "@mui/material/styles"; import React from "react"; import LocationHighlight from "@/hurumap/core/LocationHighlight"; import LocationTag from "@/hurumap/core/LocationTag"; -const LocationRoot = styled(Grid)(({ theme }) => { - const { typography } = theme; - - return { - background: alpha("#FFFFFF", 0.9), - borderRadius: typography.pxToRem(5), - bottom: "auto", - boxShadow: `0px 3px 6px ${alpha("#000000", 0.16)}`, - padding: `${typography.pxToRem(4.12)} ${typography.pxToRem(19)} ${typography.pxToRem(12)} ${typography.pxToRem(21)}`, - width: typography.pxToRem(600), - }; -}); - -const HighlightRoot = styled(Box)(({ theme }) => { - return { - borderTop: `1px solid ${theme.palette.grey.main}`, - marginTop: 4.5, - width: "100%", - }; -}); - const Location = React.forwardRef(function Location( { highlights, isLoading, tags, ...props }, ref, ) { const theme = useTheme(); return ( - - - - {tags.map((tag, index) => ( - - - - ))} - + + + {tags.map((tag, index) => ( + + + + ))} {highlights?.length > 0 ? ( - {highlights.map((highlight) => ( ))} - + ) : null} - + ); }); diff --git a/packages/hurumap-core/src/Location/Location.snap.js b/packages/hurumap-core/src/Location/Location.snap.js index 6a948febc..a31669970 100644 --- a/packages/hurumap-core/src/Location/Location.snap.js +++ b/packages/hurumap-core/src/Location/Location.snap.js @@ -3,51 +3,47 @@ exports[`Location renders unchanged 1`] = `
-
-
- Country -
- - Kenya - -
+ Country + + + Kenya +
+
+
-
+ County + + -
- County -
- - Isiolo - -
+ Isiolo +
@@ -55,7 +51,7 @@ exports[`Location renders unchanged 1`] = ` class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 css-1idn90j-MuiGrid-root" >