Merge branch 'dev-tools-pages' into feature/variables

packages/dev-tools-pages/ts/components/Content.tsx

@@ -0,0 +1,34 @@
+import * as React from 'react';
+import styled from 'styled-components';
+
+import Container from './Container';
+
+const StyledMain =
+    styled.div <
+    MainProps >
+    `
+    padding-top: 6.25rem;
+    padding-bottom: 6.25rem;
+    ${props =>
+        props.dark
+            ? `
+        background-color: #000;
+        color: #fff;
+    `
+            : ''};
+`;
+
+interface MainProps {
+    dark?: boolean;
+    children: React.ReactNode;
+}
+
+function Main(props: MainProps) {
+    return (
+        <StyledMain dark={props.dark}>
+            <Container>{props.children}</Container>
+        </StyledMain>
+    );
+}
+
+export default Main;

packages/dev-tools-pages/ts/components/ContentBlock.tsx

@@ -1,8 +1,9 @@
 import * as React from 'react';
 import styled from 'styled-components';
 
+import { withContext, Props } from './withContext';
+import { Beta, Alpha } from './Typography';
 import { media } from 'ts/variables';
-import { Beta } from './Typography';
 
 const Base = styled.div`
     display: flex;
@@ -42,9 +43,14 @@ const Item = styled.div`
     }
 `;
 
-interface ContentBlockProps {
+const StyledTitle = styled(Alpha)`
+    color: ${props => props.color};
+`;
+
+interface ContentBlockProps extends Props {
     title: string;
-    children: React.ReactNode;
+    main?: boolean;
+    children?: React.ReactNode;
 }
 
 function ContentBlock(props: ContentBlockProps) {
@@ -52,12 +58,14 @@ function ContentBlock(props: ContentBlockProps) {
         return <Item>{child}</Item>;
     });
 
+    const Title = props.main ? StyledTitle : Beta;
+
     return (
         <Base>
-            <Beta>{props.title}</Beta>
-            <Content>{children}</Content>
+            <Title color={props.colors.main}>{props.title}</Title>
+            {children ? <Content>{children}</Content> : null}
         </Base>
     );
 }
 
-export default ContentBlock;
+export default withContext(ContentBlock);

packages/dev-tools-pages/ts/components/Main.tsx

@@ -1,41 +0,0 @@
-import * as React from 'react';
-import styled from 'styled-components';
-
-import { media } from 'ts/variables';
-import { withContext, Props } from './withContext';
-
-import { Alpha } from './Typography';
-
-const StyledMain = styled.div`
-    padding-top: 6.25rem;
-    padding-bottom: 6.25rem;
-    ${media.small`
-        padding-top: 2.5rem;
-        padding-bottom: 2.5rem;
-    `};
-`;
-
-const Title = styled(Alpha)`
-    color: ${props => props.color};
-    margin-bottom: 6.25rem;
-    ${media.small`
-        margin-bottom: 3.125rem;
-    `};
-`;
-
-interface MainProps extends Props {
-    children: React.ReactNode;
-}
-
-function Main(props: MainProps) {
-    return (
-        <StyledMain>
-            <Title as="h2" color={props.colors.main}>
-                Get started
-            </Title>
-            {props.children}
-        </StyledMain>
-    );
-}
-
-export default withContext(Main);

packages/dev-tools-pages/ts/components/Tabs.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import styled from 'styled-components';
-
 import { colors } from 'ts/variables';
 import { Tabs as ReactTabs, Tab, TabList, TabPanel } from 'react-tabs';
 import Breakout from './Breakout';
@@ -41,7 +40,7 @@ const Root =
   }
   ${StyledTab}[aria-selected="true"] {
     background-color: ${colors.gray};
-  }
+  } 
 `;
 
 interface TabsProps extends Props {