From 1945387def47db1fea8e3ea1f58771fcdcaa4110 Mon Sep 17 00:00:00 2001 From: Kellator Date: Mon, 5 Sep 2016 16:36:43 -0400 Subject: [PATCH 01/15] Initial commit --- display-exercise.html | 9 ++++++-- styles/display-page.css | 46 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/display-exercise.html b/display-exercise.html index 433b6cba..1549d84c 100644 --- a/display-exercise.html +++ b/display-exercise.html @@ -16,7 +16,12 @@ - -

Placeholder!

+ +
+
+
+
+
\ No newline at end of file diff --git a/styles/display-page.css b/styles/display-page.css index e69de29b..51cf93f1 100644 --- a/styles/display-page.css +++ b/styles/display-page.css @@ -0,0 +1,46 @@ +body { + font-size: 0; + height: 500px; + width: 800px; + margin-left: auto; + margin-right: auto; + } + +.top { + height: 200px; + width: 50%; + display: inline-block; + font-size: 0px; + border: 1px solid black; + margin-right: auto; + margin-left: auto; +} +.green { + background-color: green; +} + +.blue { + background-color: blue; +} + +.bot { + height: 300px; + width: 33.33%; + border: 1px solid black; + display: inline-block; + font-size: 0px; + margin-right: auto; + margin-left: auto; +} + +.grey { + background-color: grey; +} + +.black { + background-color: black; +} + +.gold { + background-color: gold; +} \ No newline at end of file From 5692ca872014c576bef05304fd5082b935aa102b Mon Sep 17 00:00:00 2001 From: Kellator Date: Mon, 5 Sep 2016 17:21:54 -0400 Subject: [PATCH 02/15] Initial commit --- display-exercise.html | 16 +++++++++++----- styles/display-page.css | 12 +++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/display-exercise.html b/display-exercise.html index 1549d84c..6842e544 100644 --- a/display-exercise.html +++ b/display-exercise.html @@ -18,10 +18,16 @@ -
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/styles/display-page.css b/styles/display-page.css index 51cf93f1..5912abb1 100644 --- a/styles/display-page.css +++ b/styles/display-page.css @@ -1,20 +1,24 @@ -body { +.parent { font-size: 0; height: 500px; width: 800px; margin-left: auto; margin-right: auto; + margin-top: 50px } +.centered { + margin-left: auto; + margin-right: auto; +} .top { height: 200px; width: 50%; display: inline-block; font-size: 0px; border: 1px solid black; - margin-right: auto; - margin-left: auto; } + .green { background-color: green; } @@ -29,8 +33,6 @@ body { border: 1px solid black; display: inline-block; font-size: 0px; - margin-right: auto; - margin-left: auto; } .grey { From 7e514e7bc02a4bbbc7a9355860026bb32c438829 Mon Sep 17 00:00:00 2001 From: Kellator Date: Thu, 8 Sep 2016 20:26:30 -0400 Subject: [PATCH 03/15] Initial commit --- styles/position-page.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/styles/position-page.css b/styles/position-page.css index 8b137891..deb162b4 100644 --- a/styles/position-page.css +++ b/styles/position-page.css @@ -1 +1,15 @@ +nav { + padding-left: 60px; + padding-right: 60px; + position: relative; + display: inline-block; + text-align: left; + color: grey; + font-color: purple; +} + +.logo { + position: absolute; + left: 10px; +} \ No newline at end of file From dc65357279fd1799514bd8ee39dc374fe36ec776 Mon Sep 17 00:00:00 2001 From: Kellator Date: Thu, 8 Sep 2016 20:32:37 -0400 Subject: [PATCH 04/15] Initial commit --- position-exercise.html | 2 +- styles/position-page.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/position-exercise.html b/position-exercise.html index 8b60d474..38bba4d6 100644 --- a/position-exercise.html +++ b/position-exercise.html @@ -19,7 +19,7 @@