From 00afb2440dfe41f19c40030de60ffd274a782a04 Mon Sep 17 00:00:00 2001
From: August Skare <post@augustskare.no>
Date: Mon, 22 Oct 2018 13:24:43 +0200
Subject: remove contentBlock from content component

---
 packages/dev-tools-pages/ts/components/Content.tsx      | 10 +---------
 packages/dev-tools-pages/ts/components/ContentBlock.tsx |  5 ++---
 packages/dev-tools-pages/ts/pages/Compiler.tsx          | 14 +++++++++-----
 packages/dev-tools-pages/ts/pages/Cov.tsx               |  1 +
 packages/dev-tools-pages/ts/pages/Profiler.tsx          |  1 +
 packages/dev-tools-pages/ts/pages/Trace.tsx             |  1 +
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/packages/dev-tools-pages/ts/components/Content.tsx b/packages/dev-tools-pages/ts/components/Content.tsx
index 6c0270dbc..506f94fab 100644
--- a/packages/dev-tools-pages/ts/components/Content.tsx
+++ b/packages/dev-tools-pages/ts/components/Content.tsx
@@ -21,8 +21,6 @@ const StyledMain =
 `;
 
 interface MainProps {
-    title?: string;
-    subtitle?: string;
     dark?: boolean;
     children: React.ReactNode;
 }
@@ -30,13 +28,7 @@ interface MainProps {
 function Main(props: MainProps) {
     return (
         <StyledMain dark={props.dark}>
-            <Container>
-                <ContentBlock main title={props.title || 'Get started'}>
-                    {props.subtitle ? <Beta as="p">{props.subtitle}</Beta> : null}
-                </ContentBlock>
-
-                {props.children}
-            </Container>
+            <Container>{props.children}</Container>
         </StyledMain>
     );
 }
diff --git a/packages/dev-tools-pages/ts/components/ContentBlock.tsx b/packages/dev-tools-pages/ts/components/ContentBlock.tsx
index fcd85830e..fa558e9ab 100644
--- a/packages/dev-tools-pages/ts/components/ContentBlock.tsx
+++ b/packages/dev-tools-pages/ts/components/ContentBlock.tsx
@@ -29,13 +29,12 @@ const Item = styled.div`
 
 const StyledTitle = styled(Alpha)`
     color: ${props => props.color};
-    margin-bottom: 6.25rem;
 `;
 
 interface ContentBlockProps extends Props {
     title: string;
     main?: boolean;
-    children: React.ReactNode;
+    children?: React.ReactNode;
 }
 
 function ContentBlock(props: ContentBlockProps) {
@@ -48,7 +47,7 @@ function ContentBlock(props: ContentBlockProps) {
     return (
         <Base>
             <Title color={props.colors.main}>{props.title}</Title>
-            <Content>{children}</Content>
+            {children ? <Content>{children}</Content> : null}
         </Base>
     );
 }
diff --git a/packages/dev-tools-pages/ts/pages/Compiler.tsx b/packages/dev-tools-pages/ts/pages/Compiler.tsx
index 8e2c7f058..96f26a978 100644
--- a/packages/dev-tools-pages/ts/pages/Compiler.tsx
+++ b/packages/dev-tools-pages/ts/pages/Compiler.tsx
@@ -16,6 +16,7 @@ function Compiler() {
         <Base context={context}>
             <CompilerComponent />
             <Content>
+                <ContentBlock main title="Get started" />
                 <ContentBlock title="Required steps">
                     <List items={['Step 1', 'Step 2']} />
                 </ContentBlock>
@@ -45,11 +46,14 @@ const artifactAdapter = new SolCompilerArtifactAdapter(artifactsDir, contractsDi
                     </Tabs>
                 </ContentBlock>
             </Content>
-            <Content
-                title="Artifacts"
-                subtitle="Sol compiler uses solidity standard JSON output format for the artifacts. This way, you can define which parts of the artifact you need."
-                dark
-            >
+            <Content dark>
+                <ContentBlock main title="Artifacts">
+                    <p>
+                        Sol compiler uses solidity standard JSON output format for the artifacts. This way, you can
+                        define which parts of the artifact you need.
+                    </p>
+                </ContentBlock>
+
                 <ContentBlock title="Production">
                     <p>
                         Sol compiler uses solidity standard JSON output format for the artifacts. This way, you can
diff --git a/packages/dev-tools-pages/ts/pages/Cov.tsx b/packages/dev-tools-pages/ts/pages/Cov.tsx
index 1d8bbf512..c3dfb33c5 100644
--- a/packages/dev-tools-pages/ts/pages/Cov.tsx
+++ b/packages/dev-tools-pages/ts/pages/Cov.tsx
@@ -22,6 +22,7 @@ function Cov() {
                 </p>
             </Intro>
             <Content>
+                <ContentBlock main title="Get started" />
                 <ContentBlock title="Required steps">
                     <List items={['Step 1', 'Step 2']} />
                 </ContentBlock>
diff --git a/packages/dev-tools-pages/ts/pages/Profiler.tsx b/packages/dev-tools-pages/ts/pages/Profiler.tsx
index 49028c46a..48c4c122b 100644
--- a/packages/dev-tools-pages/ts/pages/Profiler.tsx
+++ b/packages/dev-tools-pages/ts/pages/Profiler.tsx
@@ -22,6 +22,7 @@ function Profiler() {
                 </p>
             </Intro>
             <Content>
+                <ContentBlock main title="Get started" />
                 <ContentBlock title="Required steps">
                     <List items={['Step 1', 'Step 2']} />
                 </ContentBlock>
diff --git a/packages/dev-tools-pages/ts/pages/Trace.tsx b/packages/dev-tools-pages/ts/pages/Trace.tsx
index 4bdc68e95..961f4534f 100644
--- a/packages/dev-tools-pages/ts/pages/Trace.tsx
+++ b/packages/dev-tools-pages/ts/pages/Trace.tsx
@@ -16,6 +16,7 @@ function Trace() {
         <Base context={context}>
             <TraceComponent />
             <Content>
+                <ContentBlock main title="Get started" />
                 <ContentBlock title="Required steps">
                     <List items={['Step 1', 'Step 2']} />
                 </ContentBlock>
-- 
cgit