feat: Update constraints page styles

theopensystemslab · May 24, 2024 · 2f8587f · 2f8587f
1 parent 8f66334
commit 2f8587f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/editor.planx.uk/src/@planx/components/PlanningConstraints/List.tsx b/editor.planx.uk/src/@planx/components/PlanningConstraints/List.tsx
@@ -16,6 +16,7 @@ import type {
 import groupBy from "lodash/groupBy";
 import React, { ReactNode } from "react";
 import ReactHtmlParser from "react-html-parser";
+import { FONT_WEIGHT_SEMI_BOLD } from "theme";
 import Caret from "ui/icons/Caret";
 import ReactMarkdownOrHtml from "ui/shared/ReactMarkdownOrHtml";
 
@@ -30,20 +31,22 @@ const CATEGORY_COLORS: Record<string, string> = {
 const PREFIX = "ConstraintsList";
 
 const classes = {
-  content: `${PREFIX}-content`
-}
+  content: `${PREFIX}-content`,
+};
 
 interface StyledAccordionProps extends BoxProps {
   category: string;
 }
 
 const StyledAccordion = styled(Accordion, {
-  shouldForwardProp: (prop) => !["category", "metadata", "content", "data"].includes(prop as string),
+  shouldForwardProp: (prop) =>
+    !["category", "metadata", "content", "data"].includes(prop as string),
 })<StyledAccordionProps>(({ theme, category }) => ({
   borderLeft: `5px solid ${CATEGORY_COLORS[category]}`,
   paddingRight: 0,
   width: "100%",
   position: "relative",
+  background: CATEGORY_COLORS[category],
   "&::after": {
     content: "''",
     position: "absolute",
@@ -54,7 +57,7 @@ const StyledAccordion = styled(Accordion, {
     background: theme.palette.border.main,
   },
   [`&.${classes.content}`]: {
-    margin: [1.5, 0]
+    margin: [1.5, 0],
   },
 }));
 
@@ -94,9 +97,9 @@ export default function ConstraintsList({
                 py={1}
                 px={2}
                 pl={2.5}
-                style={{
-                  fontWeight: 700,
-                  color: "black",
+                sx={{
+                  fontWeight: FONT_WEIGHT_SEMI_BOLD,
+                  color: (theme) => theme.palette.text.primary,
                 }}
               >
                 {category}
@@ -142,13 +145,21 @@ function ConstraintListItem({ children, ...props }: ConstraintListItemProps) {
           aria-controls={`${item}-panel`}
           classes={{ content: classes.content }}
           expandIcon={<Caret />}
-          sx={{ pr: 1.5 }}
+          sx={{ pr: 1.5, background: `rgba(255, 255, 255, 0.8)` }}
         >
-          <Typography variant="body2" pr={1.5}>{children}</Typography>
+          <Typography variant="body2" pr={1.5}>
+            {children}
+          </Typography>
         </AccordionSummary>
-        <AccordionDetails sx={{ px: 1.5, py: 2 }}>
+        <AccordionDetails
+          sx={{
+            px: 1.5,
+            py: 2,
+            background: (theme) => theme.palette.background.default,
+          }}
+        >
           <>
-            <Typography variant="h3" component="h4" gutterBottom>
+            <Typography variant="h4" gutterBottom>
               {`This property ${props?.content}`}
             </Typography>
             {Boolean(props.data?.length) && (

diff --git a/editor.planx.uk/src/@planx/components/PlanningConstraints/Public.tsx b/editor.planx.uk/src/@planx/components/PlanningConstraints/Public.tsx
@@ -14,7 +14,6 @@ import { useStore } from "pages/FlowEditor/lib/store";
 import { handleSubmit } from "pages/Preview/Node";
 import React from "react";
 import useSWR, { Fetcher } from "swr";
-import { FONT_WEIGHT_SEMI_BOLD } from "theme";
 import ReactMarkdownOrHtml from "ui/shared/ReactMarkdownOrHtml";
 import { stringify } from "wkt";
 
@@ -236,7 +235,7 @@ export function PlanningConstraintsContent(
       )}
       {!showError && positiveConstraints.length > 0 && (
         <>
-          <Typography variant="h3" component="h2" gutterBottom>
+          <Typography variant="h3" component="h2" mt={3}>
             These are the planning constraints we think apply to this property
           </Typography>
           <ConstraintsList data={positiveConstraints} metadata={metadata} />
@@ -258,15 +257,15 @@ export function PlanningConstraintsContent(
         positiveConstraints.length === 0 &&
         negativeConstraints.length > 0 && (
           <>
-            <Typography variant="h3" component="h2">
+            <Typography variant="h3" component="h2" gutterBottom mt={3}>
               It looks like there are no constraints on this property
             </Typography>
-            <Typography variant="body2">
+            <Typography variant="body1" gutterBottom>
               Based on the information you've given it looks like there are no
               planning constraints on your property that might limit what you
               can do.
             </Typography>
-            <Typography variant="body2">
+            <Typography variant="body1" gutterBottom>
               Continue with your application to tell us more about your project.
             </Typography>
             <SimpleExpand

diff --git a/editor.planx.uk/src/@planx/components/shared/Preview/SimpleExpand.tsx b/editor.planx.uk/src/@planx/components/shared/Preview/SimpleExpand.tsx
@@ -34,7 +34,7 @@ const SimpleExpand: React.FC<PropsWithChildren<Props>> = ({
   const [show, setShow] = React.useState(false);
   return (
     <>
-      <Box mx={1}>
+      <Box>
         <StyledButton
           onClick={() => setShow(!show)}
           aria-expanded={show}