From 0da4027123721d5ba63833ecf6d7a97bcd238b87 Mon Sep 17 00:00:00 2001 From: Benjamin E White Date: Tue, 28 Jun 2016 15:04:18 -0400 Subject: [PATCH 1/5] Fix quote --- position-exercise.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/position-exercise.html b/position-exercise.html index 204ed5f1..8b60d474 100644 --- a/position-exercise.html +++ b/position-exercise.html @@ -2,7 +2,7 @@ CSS Layout Exercises | position property - + @@ -31,4 +31,4 @@ - \ No newline at end of file + From c94aabee83360421707575cd49afee2fa81a32ce Mon Sep 17 00:00:00 2001 From: TriciaR Date: Mon, 24 Oct 2016 16:31:02 -0400 Subject: [PATCH 2/5] styles/display-page.css --- display-exercise.html | 23 +++++++---------- styles/display-page.css | 56 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 14 deletions(-) diff --git a/display-exercise.html b/display-exercise.html index 433b6cba..d79d9be9 100644 --- a/display-exercise.html +++ b/display-exercise.html @@ -1,22 +1,17 @@ - CSS Layout Exercises | display property - - - - - - - - - - - - -

Placeholder!

+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/styles/display-page.css b/styles/display-page.css index e69de29b..30fc95ef 100644 --- a/styles/display-page.css +++ b/styles/display-page.css @@ -0,0 +1,56 @@ +main{ + /*padding-top: 100px;*/ + /*font-size: 0px;*/ + /*display: flex;*/ + /*align-content: center;*/ +} + + +.onerow, .tworow { + border: 1px solid black; + max-width: 800px; + /*max-height: 500px; */ + margin: auto; + display: flex; + /*width: 800px;*/ + /*height: 500px;*/ +} + +.onerow { + display: flex; + width: 100%; + height: 200px; +} + +.tworow { + display: flex; + width: 100%; + height: 300px; +} + +.green { + background-color: green; + display:flex; + width: 50%; +} + +.blue { + background-color: blue; + width: 50%; + paddiong: 1pxs; +} + +.gray { + background-color: gray; + width: 33.33%; +} +.black { + background-color: black; + width: 33.33%; +} + +.gold { + background-color: gold; + width: 33.33%; +} + From 0aeac65196143d884bb90a4716c030509f9cb447 Mon Sep 17 00:00:00 2001 From: TriciaR Date: Mon, 24 Oct 2016 20:33:45 -0400 Subject: [PATCH 3/5] comment message --- display-exercise.html | 18 ++++++++++-------- styles/display-page.css | 28 +++++++++++++++++----------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/display-exercise.html b/display-exercise.html index d79d9be9..55fc2ce3 100644 --- a/display-exercise.html +++ b/display-exercise.html @@ -4,14 +4,16 @@ -
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/styles/display-page.css b/styles/display-page.css index 30fc95ef..b7ab5030 100644 --- a/styles/display-page.css +++ b/styles/display-page.css @@ -6,46 +6,52 @@ main{ } -.onerow, .tworow { - border: 1px solid black; +.container { max-width: 800px; /*max-height: 500px; */ + display: block; margin: auto; - display: flex; - /*width: 800px;*/ - /*height: 500px;*/ + margin-top: 100px; + +} + +.box { + border: 1px solid black; } .onerow { display: flex; - width: 100%; + width: 800px; height: 200px; } .tworow { display: flex; - width: 100%; + width: 800px; height: 300px; } .green { - background-color: green; + border: 1px solid black; + background-color: green; display:flex; width: 50%; } .blue { - background-color: blue; - width: 50%; - paddiong: 1pxs; + border: 1px solid black; + background-color: blue; + width: 50%; } .gray { background-color: gray; + border: 1px solid black; width: 33.33%; } .black { background-color: black; + border: 1px solid black; width: 33.33%; } From db7fe950a390eec921eb54d1e31b72afbdf8f5db Mon Sep 17 00:00:00 2001 From: TriciaR Date: Mon, 24 Oct 2016 21:03:47 -0400 Subject: [PATCH 4/5] display message --- display-exercise.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/display-exercise.html b/display-exercise.html index 55fc2ce3..b875e38e 100644 --- a/display-exercise.html +++ b/display-exercise.html @@ -1,5 +1,13 @@ + CSS Layout Exercises | position property + - + + + + + + @@ -31,4 +31,4 @@ + From 5f356a74671d75b963ed39c4c12870f312d6ccb4 Mon Sep 17 00:00:00 2001 From: Patricia Rogers Date: Mon, 24 Oct 2016 21:07:59 -0400 Subject: [PATCH 5/5] Create gh-pages --- gh-pages | 1 + 1 file changed, 1 insertion(+) create mode 100644 gh-pages diff --git a/gh-pages b/gh-pages new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/gh-pages @@ -0,0 +1 @@ +