From 2d75ae9fed1a903dda3ee7edee2c11aafeccd315 Mon Sep 17 00:00:00 2001
From: Nathan Hunzaker <nate.hunzaker@gmail.com>
Date: Tue, 3 Jan 2017 20:13:48 -0500
Subject: [PATCH] Consolidate styles into single file

---
 fixtures/src/components/App.js                |  3 +-
 .../components/fixtures/text-inputs/index.js  |  1 -
 .../components/fixtures/textareas/index.js    |  9 ++-
 fixtures/src/{styles/App.css => style.css}    | 68 ++++++++-----------
 fixtures/src/styles/TextInputs.css            | 36 ----------
 5 files changed, 38 insertions(+), 79 deletions(-)
 rename fixtures/src/{styles/App.css => style.css} (71%)
 delete mode 100644 fixtures/src/styles/TextInputs.css

diff --git a/fixtures/src/components/App.js b/fixtures/src/components/App.js
index 7d6f04b143..92550c638c 100644
--- a/fixtures/src/components/App.js
+++ b/fixtures/src/components/App.js
@@ -1,7 +1,8 @@
 const React = window.React;
 import Header from './Header';
 import Fixtures from './fixtures';
-import '../styles/App.css';
+
+import '../style.css';
 
 const App = React.createClass({
   render() {
diff --git a/fixtures/src/components/fixtures/text-inputs/index.js b/fixtures/src/components/fixtures/text-inputs/index.js
index 904a8bdc3b..7e5612157d 100644
--- a/fixtures/src/components/fixtures/text-inputs/index.js
+++ b/fixtures/src/components/fixtures/text-inputs/index.js
@@ -1,5 +1,4 @@
 const React = window.React;
-import '../../../styles/TextInputs.css';
 
 const TextInputFixtures = React.createClass({
   getInitialState() {
diff --git a/fixtures/src/components/fixtures/textareas/index.js b/fixtures/src/components/fixtures/textareas/index.js
index a96ac55f4d..cb6f2f31a1 100644
--- a/fixtures/src/components/fixtures/textareas/index.js
+++ b/fixtures/src/components/fixtures/textareas/index.js
@@ -9,8 +9,8 @@ const TextAreaFixtures = React.createClass({
   },
   render() {
     return (
-      <div className="container">
-        <form>
+      <div>
+        <form className="container">
           <fieldset>
             <legend>Controlled</legend>
             <textarea value={this.state.value} onChange={this.onChange} />
@@ -21,10 +21,13 @@ const TextAreaFixtures = React.createClass({
             <textarea defaultValue="" />
           </fieldset>
         </form>
-        <h4>Controlled Output:</h4>
+
+        <div className="container">
+          <h4>Controlled Output:</h4>
           <div className='output'>
             {this.state.value}
           </div>
+        </div>
       </div>
     );
   },
diff --git a/fixtures/src/styles/App.css b/fixtures/src/style.css
similarity index 71%
rename from fixtures/src/styles/App.css
rename to fixtures/src/style.css
index 4b8da0d3c4..6a7101c1f9 100644
--- a/fixtures/src/styles/App.css
+++ b/fixtures/src/style.css
@@ -1,29 +1,3 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  animation: App-logo-spin infinite 20s linear;
-  height: 80px;
-}
-
-.App-header {
-  background-color: #222;
-  height: 150px;
-  padding: 20px;
-  color: white;
-}
-
-.App-intro {
-  font-size: large;
-}
-
-@keyframes App-logo-spin {
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
-}
-
-
 *,
 *:before,
 *:after {
@@ -31,9 +5,9 @@
 }
 
 body {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
   margin: 0;
   padding: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
 
 select {
@@ -43,15 +17,15 @@ select {
 .header {
   background: #222;
   box-shadow: inset 0 -1px 3px #000;
+  line-height: 32px;
   overflow: hidden;
   padding: 8px 16px;
-  line-height: 32px;
 }
 
 .header__inner {
   display: table;
-  max-width: 1000px;
   margin: 0 auto;
+  max-width: 1000px;
   overflow: hidden;
   text-align: center;
   width: 100%;
@@ -77,18 +51,36 @@ select {
   width: 100%;
 }
 
-iframe {
-  display: block;
-  height: 98%;
-  height: calc(100vh - 72px);
-  margin: 20px auto 0;
-  width: 100%;
-}
-
 .sr-only {
   clip: rect(0, 0, 0, 0);
   height: 0;
   margin: -1px;
   position: absolute;
   width: 0;
-}
\ No newline at end of file
+}
+
+.container {
+  margin: 0 auto;
+  max-width: 900px;
+  overflow: hidden;
+  padding: 20px;
+}
+
+label {
+  display: block;
+  font-size: 12px;
+  letter-spacing: 0.01em;
+  margin-bottom: 4px;
+  text-transform: uppercase;
+}
+
+.field {
+  padding: 8px;
+}
+
+fieldset {
+  border: 1px solid #aaa;
+  float: left;
+  padding: 16px;
+  width: 49%;
+}
diff --git a/fixtures/src/styles/TextInputs.css b/fixtures/src/styles/TextInputs.css
deleted file mode 100644
index 1279654373..0000000000
--- a/fixtures/src/styles/TextInputs.css
+++ /dev/null
@@ -1,36 +0,0 @@
-* {
-  box-sizing: border-box;
-}
-
-body {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-}
-
-.container {
-  padding: 20px; 
-}
-
-label {
-  display: block;
-  text-transform: uppercase;
-  letter-spacing: 0.01em;
-  font-size: 12px;
-  margin-bottom: 4px;
-}
-
-.field {
-  padding: 8px;
-}
-
-form {
-  max-width: 900px;
-  margin: 0 auto;
-  width: 100%;
-}
-
-fieldset {
-  border: 1px solid #aaa;
-  padding: 16px;
-  float: left;
-  width: 49%;
-}