From ce1fef1bdc028272266c450adedc217bd9bd37b1 Mon Sep 17 00:00:00 2001 From: Justin Hong Date: Wed, 28 Mar 2018 12:14:47 -0700 Subject: [PATCH 01/17] linked html and js files --- index.html | 1 + index.js | 1 + 2 files changed, 2 insertions(+) create mode 100644 index.js diff --git a/index.html b/index.html index 39167c5..a880261 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@ Introduction to the DOM + diff --git a/index.js b/index.js new file mode 100644 index 0000000..2466f99 --- /dev/null +++ b/index.js @@ -0,0 +1 @@ +alert('Hi'); \ No newline at end of file From 5fd54ceaae8474d3dc052f936ce6a437fd5a0fbd Mon Sep 17 00:00:00 2001 From: Justin Hong Date: Wed, 28 Mar 2018 12:23:26 -0700 Subject: [PATCH 02/17] set up header and dropdown --- index.html | 14 ++++++++++++++ index.js | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index a880261..76d4938 100644 --- a/index.html +++ b/index.html @@ -6,5 +6,19 @@ +
+

Header

+ +
+
+ +
\ No newline at end of file diff --git a/index.js b/index.js index 2466f99..e69de29 100644 --- a/index.js +++ b/index.js @@ -1 +0,0 @@ -alert('Hi'); \ No newline at end of file From 1c40367b8514025b69faa69b563ef211740863d9 Mon Sep 17 00:00:00 2001 From: Justin Hong Date: Wed, 28 Mar 2018 12:29:13 -0700 Subject: [PATCH 03/17] set up content block in html --- index.html | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 76d4938..096a653 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,18 @@

Header

- +
+

Placeholder

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce risus nibh, gravida nec felis quis, facilisis facilisis lectus. Nulla ac orci pretium, condimentum orci quis, accumsan nisi. Aliquam erat volutpat. Curabitur cursus mattis libero, at viverra risus hendrerit quis. Fusce imperdiet tristique tortor non tincidunt. Mauris accumsan urna nec augue feugiat porta. Proin vitae magna in ex malesuada laoreet eget a nulla. Aliquam tristique et elit at consequat. In hac habitasse platea dictumst. +

+
+
+

Placeholder

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce risus nibh, gravida nec felis quis, facilisis facilisis lectus. Nulla ac orci pretium, condimentum orci quis, accumsan nisi. Aliquam erat volutpat. Curabitur cursus mattis libero, at viverra risus hendrerit quis. Fusce imperdiet tristique tortor non tincidunt. Mauris accumsan urna nec augue feugiat porta. Proin vitae magna in ex malesuada laoreet eget a nulla. Aliquam tristique et elit at consequat. In hac habitasse platea dictumst. +

+
\ No newline at end of file From 57647202d25bdb131cd392a6eb5f1d0607bd8f61 Mon Sep 17 00:00:00 2001 From: ktan114 <22802321+ktan114@users.noreply.github.com> Date: Wed, 28 Mar 2018 15:50:38 -0400 Subject: [PATCH 04/17] Set up flex-box to Header and Content Block --- components/Box/Box.css | 11 +++++++++++ index.html | 12 ++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/components/Box/Box.css b/components/Box/Box.css index e69de29..53f2aa8 100644 --- a/components/Box/Box.css +++ b/components/Box/Box.css @@ -0,0 +1,11 @@ +.Block { + display: flex; + border: 5px solid black; + flex-direction: row; + justify-content: center; +} + +.Block__Dropdown { + float: left; +} + diff --git a/index.html b/index.html index 096a653..bed810d 100644 --- a/index.html +++ b/index.html @@ -6,9 +6,8 @@ -
-

Header

-