diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/website/ts/@next/components/layout.tsx | 4 | ||||
| -rw-r--r-- | packages/website/ts/@next/pages/landing.tsx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/packages/website/ts/@next/components/layout.tsx b/packages/website/ts/@next/components/layout.tsx index 6f6e6cd6b..65c98997d 100644 --- a/packages/website/ts/@next/components/layout.tsx +++ b/packages/website/ts/@next/components/layout.tsx @@ -70,10 +70,10 @@ export const Main = styled.main` `; export const Section = styled.section<SectionProps>` - width: ${props => props.fullWidth ? `calc(100% + ${GUTTER * 2}px)` : '100%'}; + width: ${props => props.fullWidth ? `calc(100% + ${GUTTER * 2}px)` : '100vw'}; padding: ${props => !props.noPadding && '30px'}; margin-bottom: ${props => !props.noMargin && `${GUTTER}px`}; - margin-left: ${props => props.fullWidth && `-${GUTTER}px`}; + margin-left: ${props => props.fullWidth && `calc(750px - 50vw)`}; background-color: ${props => props.bgColor}; border: 1px dotted rgba(0, 255, 0, 0.3); `; diff --git a/packages/website/ts/@next/pages/landing.tsx b/packages/website/ts/@next/pages/landing.tsx index fa2bf45a1..c0cda84cf 100644 --- a/packages/website/ts/@next/pages/landing.tsx +++ b/packages/website/ts/@next/pages/landing.tsx @@ -5,10 +5,14 @@ import { colors } from 'ts/style/colors' import { Button, ButtonTransparent } from 'ts/@next/components/button'; import { Column, Section, Wrap } from 'ts/@next/components/layout'; import { SiteWrap } from 'ts/@next/components/siteWrap'; +<<<<<<< Updated upstream import { Heading, Intro, Text } from 'ts/@next/components/text'; import logoOutlined from 'ts/@next/icons/illustrations/logo-outlined.svg'; import protocol from 'ts/@next/icons/illustrations/protocol.svg'; +======= +import { Section, Wrap } from 'ts/@next/components/layout'; +>>>>>>> Stashed changes const Icon = styled.div` flex-shrink: 0; |