From 645a77726baddcec8912bfd159efd0907b752be5 Mon Sep 17 00:00:00 2001
From: lachlanjc <hello@lachlanjc.me>
Date: Sat, 11 Apr 2015 16:06:23 -0400
Subject: [PATCH 01/10] Refactor markup on new idea

---
 .../components/ideas/ideas_new.js.jsx         | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/components/ideas/ideas_new.js.jsx b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
index b637667c0..ca574bfd9 100644
--- a/app/assets/javascripts/components/ideas/ideas_new.js.jsx
+++ b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
@@ -1,9 +1,9 @@
 'use strict';
 
 const Drawer = require('../ui/drawer.js.jsx');
-const Tile = require('../ui/tile.js.jsx')
 const IdeaForm = require('./idea_form.js.jsx');
-const Icon = require('../ui/icon.js.jsx')
+const Icon = require('../ui/icon.js.jsx');
+const Tile = require('../ui/tile.js.jsx')
 
 let IdeasNew = React.createClass({
   propTypes: {
@@ -34,24 +34,17 @@ let IdeasNew = React.createClass({
 
   render() {
     return (
-      <div className="container">
-        <div className="clearfix mt4 mb4">
-          <div className="col-8 mx-auto">
-            <Tile>
-              <div className="p4">
-
-                <div className="center mb4">
-                  <img src="https://d1015h9unskp4y.cloudfront.net/attachments/da827015-7f37-4fdb-80d0-b8d68ae71f32/asm_mountain_360.png" />
-
-                  <h3 className="mt0 mb1">Turn your idea into a great product</h3>
-                  <h4 className="mt0 mb0 regular gray-2">The community collaborates to build the best ideas into products.</h4>
-                </div>
-
-                <IdeaForm />
-              </div>
-            </Tile>
+      <div className="sm-col-11 md-col-8 mx-auto mt4 mb4">
+        <Tile>
+          <div className="p4 center">
+            <img src="https://d1015h9unskp4y.cloudfront.net/attachments/da827015-7f37-4fdb-80d0-b8d68ae71f32/asm_mountain_360.png" />
+
+            <h3 className="mt0 mb1">Turn your idea into a great product</h3>
+            <h4 className="mt0 mb0 regular gray-2">The community collaborates to build the best ideas into products.</h4>
+
+            <IdeaForm />
           </div>
-        </div>
+        </Tile>
       </div>
     );
   }

From dd2cb4c010a27315f896bd2e170a99575324c459 Mon Sep 17 00:00:00 2001
From: lachlanjc <hello@lachlanjc.me>
Date: Mon, 13 Apr 2015 22:33:13 -0400
Subject: [PATCH 02/10] Build <Sheet />

---
 app/assets/javascripts/components/ui/sheet.js.jsx | 15 +++++++++++++++
 app/assets/javascripts/components/ui/tile.js.jsx  |  9 ++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/components/ui/sheet.js.jsx

diff --git a/app/assets/javascripts/components/ui/sheet.js.jsx b/app/assets/javascripts/components/ui/sheet.js.jsx
new file mode 100644
index 000000000..6832bd803
--- /dev/null
+++ b/app/assets/javascripts/components/ui/sheet.js.jsx
@@ -0,0 +1,15 @@
+'use strict';
+
+const Tile = require('../ui/tile.js.jsx');
+
+let Sheet = React.createClass({
+  render: function() {
+    return (
+      <article className="sm-col-11 md-col-7 lg-col-6 mx-auto mt3">
+        <Tile padding="4">
+          {this.props.children}
+        </Tile>
+      </article>
+    );
+  }
+});
diff --git a/app/assets/javascripts/components/ui/tile.js.jsx b/app/assets/javascripts/components/ui/tile.js.jsx
index b59bd035d..98727bf3e 100644
--- a/app/assets/javascripts/components/ui/tile.js.jsx
+++ b/app/assets/javascripts/components/ui/tile.js.jsx
@@ -1,6 +1,13 @@
 var Tile = React.createClass({
+  getDefaultProps: function() {
+    return {
+      padding: 0,
+    };
+  },
+
   render: function() {
-    return <div className="bg-white rounded shadow border border-gray-5">
+    var padding = (this.props.padding === 0) ? null : " p" + this.props.padding;
+    return <div className={"bg-white rounded shadow border border-gray-5" + padding}>
       {this.props.children}
     </div>
   }

From 461b664ba2c880571387d65ead0086466e07dfa9 Mon Sep 17 00:00:00 2001
From: lachlanjc <hello@lachlanjc.me>
Date: Mon, 13 Apr 2015 22:35:35 -0400
Subject: [PATCH 03/10] Refactor IdeasNew with <Sheet />

---
 app/assets/javascripts/components/ideas/ideas_new.js.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/components/ideas/ideas_new.js.jsx b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
index ca574bfd9..80f0f709d 100644
--- a/app/assets/javascripts/components/ideas/ideas_new.js.jsx
+++ b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
@@ -1,5 +1,6 @@
 'use strict';
 
+const Sheet = require('../ui/sheet.js.jsx');
 const Drawer = require('../ui/drawer.js.jsx');
 const IdeaForm = require('./idea_form.js.jsx');
 const Icon = require('../ui/icon.js.jsx');

From a09ba3a3410ed35fcd23a35f3b72dfa4f611992f Mon Sep 17 00:00:00 2001
From: lachlanjc <hello@lachlanjc.me>
Date: Thu, 30 Apr 2015 21:20:30 -0400
Subject: [PATCH 04/10] Revert "Build <Sheet />"

This reverts commit be58b2e05cf61e0789a8097ba16ee03351eb9b5f.
---
 app/assets/javascripts/components/ui/sheet.js.jsx | 15 ---------------
 app/assets/javascripts/components/ui/tile.js.jsx  |  9 +--------
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 app/assets/javascripts/components/ui/sheet.js.jsx

diff --git a/app/assets/javascripts/components/ui/sheet.js.jsx b/app/assets/javascripts/components/ui/sheet.js.jsx
deleted file mode 100644
index 6832bd803..000000000
--- a/app/assets/javascripts/components/ui/sheet.js.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-'use strict';
-
-const Tile = require('../ui/tile.js.jsx');
-
-let Sheet = React.createClass({
-  render: function() {
-    return (
-      <article className="sm-col-11 md-col-7 lg-col-6 mx-auto mt3">
-        <Tile padding="4">
-          {this.props.children}
-        </Tile>
-      </article>
-    );
-  }
-});
diff --git a/app/assets/javascripts/components/ui/tile.js.jsx b/app/assets/javascripts/components/ui/tile.js.jsx
index 98727bf3e..b59bd035d 100644
--- a/app/assets/javascripts/components/ui/tile.js.jsx
+++ b/app/assets/javascripts/components/ui/tile.js.jsx
@@ -1,13 +1,6 @@
 var Tile = React.createClass({
-  getDefaultProps: function() {
-    return {
-      padding: 0,
-    };
-  },
-
   render: function() {
-    var padding = (this.props.padding === 0) ? null : " p" + this.props.padding;
-    return <div className={"bg-white rounded shadow border border-gray-5" + padding}>
+    return <div className="bg-white rounded shadow border border-gray-5">
       {this.props.children}
     </div>
   }

From 510e3985e186b5fcbd60d26fc11ae873560eb226 Mon Sep 17 00:00:00 2001
From: lachlanjc <hello@lachlanjc.me>
Date: Thu, 30 Apr 2015 21:21:04 -0400
Subject: [PATCH 05/10] Revert "Refactor IdeasNew with <Sheet />"

This reverts commit 632af180548f627a93666528ebc33644dae10f44.
---
 app/assets/javascripts/components/ideas/ideas_new.js.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/components/ideas/ideas_new.js.jsx b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
index 80f0f709d..ca574bfd9 100644
--- a/app/assets/javascripts/components/ideas/ideas_new.js.jsx
+++ b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
@@ -1,6 +1,5 @@
 'use strict';
 
-const Sheet = require('../ui/sheet.js.jsx');
 const Drawer = require('../ui/drawer.js.jsx');
 const IdeaForm = require('./idea_form.js.jsx');
 const Icon = require('../ui/icon.js.jsx');

From 4fbd359a1778172395a731fb0420a0bb7357e7e3 Mon Sep 17 00:00:00 2001
From: lachlanjc <hello@lachlanjc.me>
Date: Thu, 30 Apr 2015 21:23:03 -0400
Subject: [PATCH 06/10] Stop using Sheet

---
 app/assets/javascripts/components/ideas/ideas_new.js.jsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/javascripts/components/ideas/ideas_new.js.jsx b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
index ca574bfd9..ccdb2ec31 100644
--- a/app/assets/javascripts/components/ideas/ideas_new.js.jsx
+++ b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
@@ -3,7 +3,11 @@
 const Drawer = require('../ui/drawer.js.jsx');
 const IdeaForm = require('./idea_form.js.jsx');
 const Icon = require('../ui/icon.js.jsx');
+<<<<<<< HEAD
 const Tile = require('../ui/tile.js.jsx')
+=======
+const Tile = require('../ui/tile.js.jsx');
+>>>>>>> Stop using Sheet
 
 let IdeasNew = React.createClass({
   propTypes: {

From e0cf158d730f126c92017d472d87132ab3e2061c Mon Sep 17 00:00:00 2001
From: lachlanjc <hello@lachlanjc.me>
Date: Thu, 30 Apr 2015 21:40:40 -0400
Subject: [PATCH 07/10] Fix merge conflicts


From 9146caab5eb40f3afa8f87ef20f7bd58896fb30f Mon Sep 17 00:00:00 2001
From: lachlanjc <hello@lachlanjc.me>
Date: Thu, 30 Apr 2015 21:42:29 -0400
Subject: [PATCH 08/10] Remove git barf

---
 app/assets/javascripts/components/ideas/ideas_new.js.jsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/assets/javascripts/components/ideas/ideas_new.js.jsx b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
index ccdb2ec31..bf44be175 100644
--- a/app/assets/javascripts/components/ideas/ideas_new.js.jsx
+++ b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
@@ -3,11 +3,7 @@
 const Drawer = require('../ui/drawer.js.jsx');
 const IdeaForm = require('./idea_form.js.jsx');
 const Icon = require('../ui/icon.js.jsx');
-<<<<<<< HEAD
-const Tile = require('../ui/tile.js.jsx')
-=======
 const Tile = require('../ui/tile.js.jsx');
->>>>>>> Stop using Sheet
 
 let IdeasNew = React.createClass({
   propTypes: {

From db284014410370603b41e8d7af776b68807a5d82 Mon Sep 17 00:00:00 2001
From: lachlanjc <hello@lachlanjc.me>
Date: Thu, 30 Apr 2015 21:53:44 -0400
Subject: [PATCH 09/10] Fix display issue

---
 app/assets/javascripts/components/ideas/ideas_new.js.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/components/ideas/ideas_new.js.jsx b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
index bf44be175..cf8353369 100644
--- a/app/assets/javascripts/components/ideas/ideas_new.js.jsx
+++ b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
@@ -34,13 +34,13 @@ let IdeasNew = React.createClass({
 
   render() {
     return (
-      <div className="sm-col-11 md-col-8 mx-auto mt4 mb4">
+      <div className="sm-col-11 md-col-6 mx-auto mt4 mb4">
         <Tile>
-          <div className="p4 center">
+          <div className="mt3 mb4 px4">
             <img src="https://d1015h9unskp4y.cloudfront.net/attachments/da827015-7f37-4fdb-80d0-b8d68ae71f32/asm_mountain_360.png" />
 
-            <h3 className="mt0 mb1">Turn your idea into a great product</h3>
-            <h4 className="mt0 mb0 regular gray-2">The community collaborates to build the best ideas into products.</h4>
+            <h3 className="mb1 center">Turn your idea into a great product</h3>
+            <h4 className="mt0 mb0 regular gray-2 center">The community collaborates to build the best ideas into products.</h4>
 
             <IdeaForm />
           </div>

From c26da35c5a4b06b18c0ac698dc246cbde64134a4 Mon Sep 17 00:00:00 2001
From: lachlanjc <hello@lachlanjc.me>
Date: Thu, 7 May 2015 21:36:19 -0400
Subject: [PATCH 10/10] =?UTF-8?q?Fixes=20for=20the=20=F0=9F=91=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/javascripts/components/ideas/ideas_new.js.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/components/ideas/ideas_new.js.jsx b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
index cf8353369..2c327ef0d 100644
--- a/app/assets/javascripts/components/ideas/ideas_new.js.jsx
+++ b/app/assets/javascripts/components/ideas/ideas_new.js.jsx
@@ -34,13 +34,13 @@ let IdeasNew = React.createClass({
 
   render() {
     return (
-      <div className="sm-col-11 md-col-6 mx-auto mt4 mb4">
+      <div className="sm-col-11 md-col-8 mx-auto mt3 mb4">
         <Tile>
           <div className="mt3 mb4 px4">
-            <img src="https://d1015h9unskp4y.cloudfront.net/attachments/da827015-7f37-4fdb-80d0-b8d68ae71f32/asm_mountain_360.png" />
+            <img className="mx-auto block" src="https://d1015h9unskp4y.cloudfront.net/attachments/da827015-7f37-4fdb-80d0-b8d68ae71f32/asm_mountain_360.png" />
 
             <h3 className="mb1 center">Turn your idea into a great product</h3>
-            <h4 className="mt0 mb0 regular gray-2 center">The community collaborates to build the best ideas into products.</h4>
+            <h4 className="mt0 mb3 regular gray-2 center">The community collaborates to build the best ideas into products.</h4>
 
             <IdeaForm />
           </div>