From 4edb0328eb2214a4793b37937c1a485b12891d36 Mon Sep 17 00:00:00 2001 From: KevinASF Date: Sat, 3 Sep 2016 08:49:16 -0600 Subject: [PATCH 1/2] Display exercise Display exercise --- display-exercise.html | 30 +++++++++++++++++++++++-- styles/main.css | 51 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/display-exercise.html b/display-exercise.html index 433b6cba..b8720abe 100644 --- a/display-exercise.html +++ b/display-exercise.html @@ -17,6 +17,32 @@ -

Placeholder!

- + +
+ +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ \ No newline at end of file diff --git a/styles/main.css b/styles/main.css index 8d5db309..b2b2823f 100644 --- a/styles/main.css +++ b/styles/main.css @@ -5,4 +5,55 @@ body * { a { text-decoration: none; +} + +main { + font-size: 0; +} + +.container { + margin-top: 90px; + margin-left: auto; + margin-right: auto; + width: 800px; +} + +.centred { + text-align: center; +} + +.caja { + border: 1px solid black; + display: inline-block; +} + +.up{ + width: 50%; + height: 200px; +} + +.down { + width: 33.33%; + height: 300px; +} + +.green { + background-color: green; +} + +.blue { + background-color: blue; +} + +.orange { + background-color: orange; +} + +.gray { + background-color: gray; +} + +.black { + background-color: black; + border: 1px solid; } \ No newline at end of file From 92f13be2ebe47af3a05fdab48a466eb802305f6b Mon Sep 17 00:00:00 2001 From: KevinASF Date: Sat, 3 Sep 2016 09:49:54 -0600 Subject: [PATCH 2/2] Position exercise Position exercise --- position-exercise.html | 8 +++-- styles/position-page.css | 72 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/position-exercise.html b/position-exercise.html index 8b60d474..70c2c7de 100644 --- a/position-exercise.html +++ b/position-exercise.html @@ -18,8 +18,8 @@ -