diff --git a/packages/app/src/components/collapsible/collapsible-section.tsx b/packages/app/src/components/collapsible/collapsible-section.tsx index db119ad993..ca09c061c3 100644 --- a/packages/app/src/components/collapsible/collapsible-section.tsx +++ b/packages/app/src/components/collapsible/collapsible-section.tsx @@ -13,11 +13,11 @@ interface CollapsibleSectionProps extends BoxProps { children: ReactNode; id?: string; hideBorder?: boolean; - textColorOverride?: string; - borderColorOverride?: string; + textColor?: string; + borderColor?: string; } -export const CollapsibleSection = ({ summary, children, id, hideBorder, textColorOverride = colors.blue8, borderColorOverride = colors.gray2 }: CollapsibleSectionProps) => { +export const CollapsibleSection = ({ summary, children, id, hideBorder, textColor = colors.blue8, borderColor = colors.gray2 }: CollapsibleSectionProps) => { const section = useRef(null); const collapsible = useCollapsible(); @@ -51,9 +51,9 @@ export const CollapsibleSection = ({ summary, children, id, hideBorder, textColo }, [toggle, id]); return ( - + {collapsible.button( - + {summary} {id && ( @@ -89,15 +89,15 @@ const StyledAnchor = styled(Anchor)( interface SummaryProps { textColor: string; } -const Summary = styled.button((summaryProps: SummaryPropsType) => +const Summary = styled.button((summaryProps: SummaryProps) => css({ display: 'flex', alignItems: 'flex-start', justifyContent: 'space-between', overflow: 'visible', width: '100%', - m: 0, - p: 3, + margin: 0, + padding: 3, bg: 'transparent', border: 'none', color: summaryProps.textColor, diff --git a/packages/app/src/domain/topical/components/indicator-level-description.tsx b/packages/app/src/domain/topical/components/indicator-level-description.tsx index cc59a16ccc..decb77cb85 100644 --- a/packages/app/src/domain/topical/components/indicator-level-description.tsx +++ b/packages/app/src/domain/topical/components/indicator-level-description.tsx @@ -1,11 +1,11 @@ +import css from '@styled-system/css'; import { SeverityIndicatorLevel } from '~/components/severity-indicator-tile/components/severity-indicator-label'; import { SeverityLevel } from '~/components/severity-indicator-tile/types'; import { replaceVariablesInText } from '~/utils'; import { asResponsiveArray } from '~/style/utils'; -import { Text } from '~/components/typography'; -import { Box } from '~/components/base'; -import css from '@styled-system/css'; +import { Text, BoldText } from '~/components/typography'; import { space } from '~/style/theme'; +import { Box } from '~/components/base'; interface IndicatorLevelDescriptionProps { level: SeverityLevel; @@ -13,23 +13,25 @@ interface IndicatorLevelDescriptionProps { description: string; } -export const IndicatorLevelDescription = ({ level, label, description }: indicatorLevelDescriptionProps) => { +export const IndicatorLevelDescription = ({ level, label, description }: IndicatorLevelDescriptionProps) => { return ( - - {level} - {label} - - {replaceVariablesInText(description.split('**').join(''), { - label: label.toLowerCase(), - })} - - +
  • + + {level} + {label} + + {replaceVariablesInText(description.split('**').join(''), { + label: label.toLowerCase(), + })} + + +
  • ); }; diff --git a/packages/app/src/pages/index.tsx b/packages/app/src/pages/index.tsx index 7a7167b5bd..8a781fcd0f 100644 --- a/packages/app/src/pages/index.tsx +++ b/packages/app/src/pages/index.tsx @@ -1,4 +1,6 @@ import { Box, Spacer } from '~/components/base'; +import styled from 'styled-components'; +import { css } from '@styled-system/css'; import { Markdown, MaxWidth } from '~/components'; import { Layout } from '~/domain/layout'; import { @@ -94,12 +96,16 @@ const Home = (props: StaticProps) => { footerText={textNl.thermometer.indicator.footerText} /> - + - {Object.values(SeverityLevels).map((severityLevel, index) => { - const indicatorTexts = textNl.thermometer[`indicator_for_level_${severityLevel}`]; - return ; - })} + + {Object.values(SeverityLevels).map((severityLevel, index) => { + const indicatorTexts = textNl.thermometer[`indicator_for_level_${severityLevel}`]; + return ( + + ); + })} + @@ -190,4 +196,12 @@ const Home = (props: StaticProps) => { ); }; +const OrderedList = styled.ol( + css({ + listStyleType: 'none', + margin: 0, + padding: 0, + }) +); + export default Home;