Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new Figure component #227

Merged
merged 16 commits into from
Mar 24, 2022
Merged

Use new Figure component #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a59f07c
Test integration with three figures
katamartin Mar 21, 2022
32fc8eb
Update packages and remaining ton-year figures
katamartin Mar 21, 2022
df7409b
Use semantic tags based on parent element
katamartin Mar 21, 2022
e1b770c
Update all figures
katamartin Mar 21, 2022
c1da5bf
Remove override
katamartin Mar 21, 2022
50c48f1
Use develop tags
katamartin Mar 21, 2022
2d1b6ad
package-lock
katamartin Mar 22, 2022
24916b8
package-lock
katamartin Mar 22, 2022
e8b2bc0
layouts@2.1.0-develop.1
katamartin Mar 22, 2022
0e9a8c1
Use layouts@2.1.0-develop.2
katamartin Mar 22, 2022
282bacb
Explicitly specify @theme-ui/core version
katamartin Mar 22, 2022
09ad9be
Import Figure from components
katamartin Mar 23, 2022
e47e777
Use new components tag
katamartin Mar 23, 2022
9d302f6
Restore custom spacing
katamartin Mar 23, 2022
8296e1c
Use figure tag consistently
katamartin Mar 23, 2022
240e59a
Use new components version
katamartin Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 61 additions & 63 deletions articles/carbon-removal-mechanisms/components/cycle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,73 +251,71 @@ const Cycle = ({ tag, data, labels, intro }) => {
}

return (
<Box sx={{ mt: [6, 6, 6, 7], mb: [6, 6, 6, 7] }}>
<Row columns={[6]}>
<Column start={[1]} width={[6, 5, 5, 5]}>
<Box
sx={{
width: ['100%'],
}}
<Row columns={[6]} sx={{ mb: [6, 6, 6, 7] }}>
<Column start={[1]} width={[6, 5, 5, 5]}>
<Box
sx={{
width: ['100%'],
}}
>
<svg
stroke='none'
strokeWidth='2px'
strokeLinecap='round'
strokeMiterlimit='10'
fill='none'
viewBox='6 16 335 110'
>
<svg
stroke='none'
strokeWidth='2px'
strokeLinecap='round'
strokeMiterlimit='10'
fill='none'
viewBox='6 16 335 110'
>
<Box
as='rect'
sx={{ fill: mix('muted', 'background', 0.5) }}
x='6.3'
y='21.4'
width='333.8'
height='33'
rx='17'
/>
<Box
as='rect'
sx={{ fill: mix('muted', 'background', 0.5) }}
x='6.3'
y='21.4'
width='333.8'
height='33'
rx='17'
/>

<g transform=''>
{arrow('land', 'material', 78)}
{arrow('material', 'geological', 43)}
{arrow('fuel', 'geological', 60, 1)}
</g>
<g transform=''>
{arrow('land', 'material', 78)}
{arrow('material', 'geological', 43)}
{arrow('fuel', 'geological', 60, 1)}
</g>

<g transform='translate(0,0)'>
{element('fuel', 0)}
{element('geological', 70)}
{element('material', 140)}
{element('land', 210)}
{element('ocean', 280)}
</g>
<g transform='translate(0,0)'>
{element('fuel', 0)}
{element('geological', 70)}
{element('material', 140)}
{element('land', 210)}
{element('ocean', 280)}
</g>

{labels && (
<>
<Box
as='g'
sx={{
fill: 'text',
textTransform: 'uppercase',
fontFamily: 'heading',
fontSize: ['12px'],
}}
>
<text x='131' y='26'>
Atmosphere
</text>
{label('Fuels', 16)}
{label('Geologic', 73)}
{label('Material', 148)}
{label('Land', 228)}
{label('Ocean', 293)}
</Box>
</>
)}
</svg>
</Box>
</Column>
</Row>
</Box>
{labels && (
<>
<Box
as='g'
sx={{
fill: 'text',
textTransform: 'uppercase',
fontFamily: 'heading',
fontSize: ['12px'],
}}
>
<text x='131' y='26'>
Atmosphere
</text>
{label('Fuels', 16)}
{label('Geologic', 73)}
{label('Material', 148)}
{label('Land', 228)}
{label('Ocean', 293)}
</Box>
</>
)}
</svg>
</Box>
</Column>
</Row>
)
}

Expand Down
Loading