From 5ea1d7bb27d86dd8a9980066dfe50091fdf63824 Mon Sep 17 00:00:00 2001 From: Nate152 <35231160+Nate152@users.noreply.github.com> Date: Mon, 22 Jan 2018 17:39:26 -0500 Subject: [PATCH 1/3] BoxModel --- index.html | 14 +++++++++++++- package-lock.json | 3 +++ styles.css | 31 +++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 package-lock.json diff --git a/index.html b/index.html index f74abbf..f9f63b5 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,18 @@ - +

Header

+
+

Placeholder

+
+

New!

+
+

"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." +

+
+

Placeholder

+

"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." +

+
\ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..48e341a --- /dev/null +++ b/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +} diff --git a/styles.css b/styles.css index e69de29..0803483 100644 --- a/styles.css +++ b/styles.css @@ -0,0 +1,31 @@ +h1 { + text-align: center; +} + +.split { + display: inline-block; + width: 50%; + box-sizing: border-box; + margin: 0; + padding: 10px; + border: solid black 3px; + height: 300px; + padding-right: 0px; +} + +.floatRight { + float: right; + width: 50px; + height: 30px; + border: solid black 1px; + background-color: grey; + box-sizing: border-box; + text-align: center; +} +h2 { + display: inline-block; +} + +.centerText { + margin: 10px 7px 7px; +} \ No newline at end of file From 7b59b47d0271b20f83a8557089b0951379b3e872 Mon Sep 17 00:00:00 2001 From: Nate152 <35231160+Nate152@users.noreply.github.com> Date: Tue, 23 Jan 2018 18:22:42 -0500 Subject: [PATCH 2/3] BoxModel --- index.html | 2 ++ styles.css | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index f9f63b5..f2683ef 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ +

Header

Placeholder

@@ -19,5 +20,6 @@

Placeholder

"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."

+
\ No newline at end of file diff --git a/styles.css b/styles.css index 0803483..7666cd2 100644 --- a/styles.css +++ b/styles.css @@ -1,3 +1,7 @@ +.pageBorder { + box-sizing: border-box; + border: solid black 3px; +} h1 { text-align: center; } @@ -8,7 +12,10 @@ h1 { box-sizing: border-box; margin: 0; padding: 10px; - border: solid black 3px; + border-left: solid black 1.5px; + border-right: solid black 1.5px; + border-bottom: solid black 1.5px; + border-top: solid black 3px; height: 300px; padding-right: 0px; } From 33a106bc491a2c11046d06f0c005f58e89bb0983 Mon Sep 17 00:00:00 2001 From: Nate152 <35231160+Nate152@users.noreply.github.com> Date: Tue, 23 Jan 2018 18:50:02 -0500 Subject: [PATCH 3/3] BoxModelMedia --- styles.css | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/styles.css b/styles.css index 7666cd2..558fff7 100644 --- a/styles.css +++ b/styles.css @@ -12,9 +12,18 @@ h1 { box-sizing: border-box; margin: 0; padding: 10px; - border-left: solid black 1.5px; border-right: solid black 1.5px; - border-bottom: solid black 1.5px; + border-top: solid black 3px; + height: 300px; + padding-right: 0px; +} +.split2 { + display: inline-block; + width: 50%; + box-sizing: border-box; + margin: 0; + padding: 10px; + border-left: solid black 1.5px; border-top: solid black 3px; height: 300px; padding-right: 0px; @@ -35,4 +44,57 @@ h2 { .centerText { margin: 10px 7px 7px; +} +@media (max-width: 600px) { + .pageBorder { + box-sizing: border-box; + border: solid black 3px; + } + h1 { + text-align: center; + } + + .split { + display: block; + width: 100%; + box-sizing: border-box; + margin: 0; + padding: 10px; + border-left: solid black 1.5px; + border-right: solid black 1.5px; + border-bottom: solid black 1.5px; + border-top: solid black 3px; + height: 300px; + padding-right: 0px; + } + .split2 { + display: block; + width: 100%; + box-sizing: border-box; + margin: 0; + padding: 10px; + border-left: solid black 1.5px; + border-right: solid black 1.5px; + border-bottom: solid black 1.5px; + border-top: solid black 3px; + height: 300px; + padding-right: 0px; + } + + .floatRight { + float: right; + width: 50px; + height: 30px; + border: solid black 1px; + background-color: grey; + box-sizing: border-box; + text-align: center; + } + h2 { + display: block; + } + + .centerText { + margin: 10px 7px 7px; + } } \ No newline at end of file