Skip to content

Commit

Permalink
Merge branch 'malj/1880' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
millianapia committed Nov 13, 2023
2 parents 80e7d5a + 5fb1d31 commit 5c270c1
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
1 change: 1 addition & 0 deletions web/pageComponents/shared/portableText/IngressText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const { Item } = List

const StyledList = styled(List)`
font-size: var(--typeScale-2);
margin-bottom: var(--space-medium);
`

const defaultComponents = (centered: boolean) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { List } from '@components'
import styled from 'styled-components'

const StyledList = styled(List)`
margin-bottom: var(--space-medium);
`

export const BulletList = ({ children }: { children?: React.ReactNode }) => {
return <List>{children}</List>
return <StyledList>{children}</StyledList>
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { List } from '@components'
import styled from 'styled-components'

const StyledList = styled(List)`
margin-bottom: var(--space-medium);
`
export const NumberedList = ({ children }: { children?: React.ReactNode }) => {
return <List variant="numbered">{children}</List>
return <StyledList variant="numbered">{children}</StyledList>
}
2 changes: 1 addition & 1 deletion web/pageComponents/topicPages/TextBlock.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Eyebrow, BackgroundContainer, Text, Heading } from '@components'
import { Eyebrow, BackgroundContainer, Heading } from '@components'
import IngressText from '../shared/portableText/IngressText'
import RichText from '../shared/portableText/RichText'
import TitleText from '../shared/portableText/TitleText'
Expand Down

0 comments on commit 5c270c1

Please sign in to comment.