From 31f085389ea0266b82e01b0f4f93b5b7b7a968e8 Mon Sep 17 00:00:00 2001
From: runnerjustin63 <justinpbarnes1@gmail.com>
Date: Tue, 16 Aug 2016 21:18:21 -0500
Subject: [PATCH 1/3] all css files

---
 display-exercise.html    | 22 ++++++++----
 position-exercise.html   | 17 ++++++----
 styles/display-page.css  | 51 ++++++++++++++++++++++++++++
 styles/float-page.css    | 16 +++++++++
 styles/position-page.css | 73 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 166 insertions(+), 13 deletions(-)
diff --git a/display-exercise.html b/display-exercise.html
index 433b6cba..362b66aa 100644
--- a/display-exercise.html
+++ b/display-exercise.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>CSS Layout Exercises | display property</title>
-  <meta charset="utf-8" name="description" content="Layout exercise on `display` property for Thinkful's front end web development course">
+  <title>CSS Layout Exercises | position property</title>
+  <meta charset="utf-8" name="description" content="Layout exercise on `position` property for Thinkful's front end web development course">
 
   <!-- fonts  -->
   <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
@@ -10,13 +10,23 @@
   <!-- reset -->
   <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/4.1.1/normalize.min.css">
 
-  <!-- styles -->
+  <!--testing 1,2, 3 -->
   <link rel="stylesheet" type="text/css" href="styles/main.css">
-  <!-- your styles will go in display-page.css -->
   <link rel="stylesheet" type="text/css" href="styles/display-page.css">
 </head>
 <body>
-<!-- your HTML here to implement the colored box design -->
-	<p>Placeholder!</p>
+  <main>
+    <div class="box-parent">
+      <div class='centered'>
+        <div class='box box_half green'></div>
+        <div class='box box_half blue'></div>
+      </div>
+      <div class='centered'>
+        <div class='box box_third grey'></div>
+        <div class='box box_third black'></div>
+        <div class='box box_third orange'></div>
+      </div>
+    </div>
+  </main>
 </body>
 </html>
\ No newline at end of file
diff --git a/position-exercise.html b/position-exercise.html
index 8b60d474..53aabf19 100644
--- a/position-exercise.html
+++ b/position-exercise.html
@@ -12,14 +12,12 @@
 
   <!-- styles -->
   <link rel="stylesheet" type="text/css" href="styles/main.css">
-
-  <!-- your styles go in position-page.css -->
   <link rel="stylesheet" type="text/css" href="styles/position-page.css">
 </head>
 <body>
-  <!-- To finish the design, the HTML for the nav requires no additional elements, just the right CSS -->
-  <nav>
-    <img src="images/icon.png">
+  <!-- put your nav code in the nav element-->
+  <nav class="container">
+    <img src="images/icon.png" class="icon-img">
     <ul>
       <li><a href="index.html">Home</a></li>
       <li><a href="display-exercise.html">display</a></li>
@@ -28,7 +26,12 @@
   </nav>
 
   <main>
-    <!-- Put the HTML you need to accomplish the design -->
+    <div class="hero-image">
+      <div class="box">
+        <img src="images/spacecat.png" class='spacecat'>
+        <img src="images/spacedog.png" class='spacedog'>
+      </div>
+    </div>
   </main>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/styles/display-page.css b/styles/display-page.css
index e69de29b..b310b94a 100644
--- a/styles/display-page.css
+++ b/styles/display-page.css
@@ -0,0 +1,51 @@
+main {
+  font-size: 0;
+}
+
+
+.box-parent {
+  margin-top: 90px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 800px;
+}
+
+.box {
+  border: 1px solid black;
+  display: inline-block;
+}
+
+.box_half {
+  width: 50%;
+  height: 200px;
+}
+
+.box_third {
+  width: 33.33%;
+  height: 300px;
+}
+
+.black {
+  background-color: black;
+  border: 1px solid;
+}
+
+.green {
+  background-color: green;
+}
+
+.grey {
+  background-color: grey;
+}
+
+.blue {
+  background-color: blue;
+}
+
+.orange {
+  background-color: orange
+}
+
+.centered {
+  text-align: center;
+}
\ No newline at end of file
diff --git a/styles/float-page.css b/styles/float-page.css
index 7bf3ead4..3f716eb4 100644
--- a/styles/float-page.css
+++ b/styles/float-page.css
@@ -10,3 +10,19 @@ main {
   margin-left: auto;
   margin-right: auto;
 }
+
+
+.left, .right {
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+
+.left {
+  float: left;
+  margin-right: 15px;
+}
+
+.right {
+  float: right;
+  margin-left: 15px;
+}
diff --git a/styles/position-page.css b/styles/position-page.css
index 8b137891..77998541 100644
--- a/styles/position-page.css
+++ b/styles/position-page.css
@@ -1 +1,74 @@
+.container {
+  padding-left: 60px;
+  padding-right: 60px;
+}
 
+nav {
+  height: 60px;
+  background-color: grey;
+  position: fixed;
+  width: 100%;
+}
+
+nav .icon-img {
+  height: 50px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  border-radius: 50%;
+  vertical-align: middle;
+  border: 1px solid black;
+}
+
+nav ul {
+  display: inline-block;
+  list-style: none;
+}
+
+nav li {
+  display: inline-block;
+}
+
+nav li::after {
+  content: "|";
+  margin-left: 5px;
+}
+
+nav a:hover {
+  color: black;
+}
+
+body {
+  background: url(../images/outerspace_landscape.jpeg) no-repeat;
+  background-size: cover;
+}
+
+main {
+  padding-top: 90px;
+  min-width: 1000px;
+}
+
+.box {
+  margin-top: 150px;
+  width: 600px;
+  height: 300px;
+  position: relative;
+  border: 10px dotted green;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+
+.spacecat, .spacedog {
+  position: absolute;
+  width: 200px;
+}
+
+.spacecat {
+  top: -90px;
+  left: -90px;
+}
+
+.spacedog {
+  bottom: -120px;
+  right: -60px;
+}

From f3001fa984e859b685b822f532901ff09696955f Mon Sep 17 00:00:00 2001
From: runnerjustin63 <justinpbarnes1@gmail.com>
Date: Thu, 18 Aug 2016 10:29:47 -0500
Subject: [PATCH 2/3] updates to css exercises

---
 display-exercise.html   | 10 +++++-----
 float-exercise.html     |  2 +-
 styles/display-page.css |  3 ++-
 styles/float-page.css   |  4 ++++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/display-exercise.html b/display-exercise.html
index 362b66aa..0ba9b162 100644
--- a/display-exercise.html
+++ b/display-exercise.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>CSS Layout Exercises | position property</title>
-  <meta charset="utf-8" name="description" content="Layout exercise on `position` property for Thinkful's front end web development course">
+  <title>CSS Layout Exercise </title>
+  <meta charset="utf-8" name="Disply Exercise" content="Display Exercise practicing the use of CSS">
 
-  <!-- fonts  -->
+  
   <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
 
-  <!-- reset -->
+  
   <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/4.1.1/normalize.min.css">
 
-  <!--testing 1,2, 3 -->
+  
   <link rel="stylesheet" type="text/css" href="styles/main.css">
   <link rel="stylesheet" type="text/css" href="styles/display-page.css">
 </head>
diff --git a/float-exercise.html b/float-exercise.html
index 975755a0..295e0620 100644
--- a/float-exercise.html
+++ b/float-exercise.html
@@ -22,7 +22,7 @@
 	  <h1>Nebulas</h1>
     <h3>Are they really that nebulous?</h3>
 
-    <p>Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur <img src="images/nebula1.png"> labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat. Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad <img src="images/nebula2.png"> qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute.</p>
+    <p>Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur <img src="images/nebula1.png" class = "left"/> labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat. Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad <img src="images/nebula2.png" class = "right"/> qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute.</p>
     <p>Nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat. Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat.</p>
   </main>
 
diff --git a/styles/display-page.css b/styles/display-page.css
index b310b94a..f300644e 100644
--- a/styles/display-page.css
+++ b/styles/display-page.css
@@ -4,10 +4,11 @@ main {
 
 
 .box-parent {
-  margin-top: 90px;
+  margin-top: 70px;
   margin-left: auto;
   margin-right: auto;
   width: 800px;
+  height: 500px;
 }
 
 .box {
diff --git a/styles/float-page.css b/styles/float-page.css
index 3f716eb4..ae76ff98 100644
--- a/styles/float-page.css
+++ b/styles/float-page.css
@@ -20,9 +20,13 @@ main {
 .left {
   float: left;
   margin-right: 15px;
+  width: 20em;
+  height: 20em;
 }
 
 .right {
   float: right;
   margin-left: 15px;
+  width: 20em;
+  height: 20em;
 }

From 4ec831216a98fe4a9bfc43ec2dff6d3f4b8753df Mon Sep 17 00:00:00 2001
From: runnerjustin63 <justinpbarnes1@gmail.com>
Date: Thu, 18 Aug 2016 12:28:47 -0500
Subject: [PATCH 3/3] updated float-exercise

---
 float-exercise.html | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/float-exercise.html b/float-exercise.html
index 295e0620..cb432498 100644
--- a/float-exercise.html
+++ b/float-exercise.html
@@ -2,27 +2,26 @@
 <html>
 <head>
   <title>CSS Layout Exercises | float property</title>
-  <meta charset="utf-8" name="description" content="Layout exercise on `float` property for Thinkful's front end web development course">
+  <meta charset="utf-8" name="CSS Layout Exercise" content="Float layout exericse">
 
-  <!-- fonts  -->
+ 
   <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
 
-  <!-- reset -->
+
   <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/4.1.1/normalize.min.css">
 
-  <!-- styles -->
   <link rel="stylesheet" type="text/css" href="styles/main.css">
 
-  <!-- your style rules go in float-page.css -->
+  
   <link rel="stylesheet" type="text/css" href="styles/float-page.css">
 </head>
 <body>
-<!-- for this exercise, you don't need to add or remove any HTML elements, though you may want to add classes. You need to write the CSS rules to get the HTML below to look like the design. -->
+
   <main>
-	  <h1>Nebulas</h1>
+    <h1>Nebuladd</h1>
     <h3>Are they really that nebulous?</h3>
 
-    <p>Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur <img src="images/nebula1.png" class = "left"/> labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat. Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad <img src="images/nebula2.png" class = "right"/> qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute.</p>
+    <p>Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur <img src="images/nebula1.png" class = "left"> labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat. Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad <img src="images/nebula2.png" class = "right"> qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute.</p>
     <p>Nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat. Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat.</p>
   </main>
 
