From 4f9cafc5fa2cbd1e1093ec1a7c0e7a6053163d08 Mon Sep 17 00:00:00 2001 From: Simon Mai Date: Thu, 31 Aug 2017 20:48:52 -0400 Subject: [PATCH 1/6] Apply bootstrap grid classes --- index.html | 87 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 28 deletions(-) diff --git a/index.html b/index.html index e2bedec..14c7d49 100644 --- a/index.html +++ b/index.html @@ -2,46 +2,77 @@ Cookie Store + + +
+
+
+ +
+
+
+
+

Cookie Store

+

Buy our awesome cookies. All proceeds go to charity!

+
+
+
+
+

The Cookies

+
+
+
+
+

Thin Mint Cookies

+

Tasty mint chocolate cookies

+ +
+
+

Peanut Butter Cookies

+

Yummy peanut buttery goodness!

+ +
+
+

Short Bread Cookies

+

Santa's favorite classic.

+ +
+
+

Smore's Cookies

+

Camp fire favorite!

+ +
+
+

About us

+
Lorem ipsum dolor sit amet, consectetur adipisicing 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.
+ +

Contact us

+
+ 100 Broadway Avenue,
+ New York, NY 10001
+ (212) 555-1234 +
+
+
+
+ -

Cookie Store

-

Buy our awesome cookies. All proceeds go to charity!

-

The Cookies

-

Thin Mint Cookies

-

Tasty mint chocolate cookies

- -

Peanut Butter Cookies

-

Yummy peanut buttery goodness!

- -

Short Bread Cookies

-

Santa's favorite classic.

- -

Smore's Cookies

-

Camp fire favorite!

- -

About us

-
Lorem ipsum dolor sit amet, consectetur adipisicing 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.
-

Contact us

-
- 100 Broadway Avenue,
- New York, NY 10001
- (212) 555-1234 -
From d4934aa8ea5a9f81f3ab4075c5d4f28447358408 Mon Sep 17 00:00:00 2001 From: Simon Mai Date: Thu, 31 Aug 2017 20:57:24 -0400 Subject: [PATCH 2/6] Fix grid structure --- index.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 14c7d49..62aa6e3 100644 --- a/index.html +++ b/index.html @@ -8,22 +8,19 @@
-
-
- -
-

Cookie Store

Buy our awesome cookies. All proceeds go to charity!

+

The Cookies

+

Thin Mint Cookies

@@ -45,6 +42,9 @@

Smore's Cookies

Camp fire favorite!

+
+ +

About us

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod @@ -53,7 +53,11 @@

About us

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.
+
+
+
+

Contact us

100 Broadway Avenue,
From ca2399f0b34e8a587e59ded8536d79bae2d27fce Mon Sep 17 00:00:00 2001 From: Simon Mai Date: Tue, 5 Sep 2017 13:47:11 -0400 Subject: [PATCH 3/6] Initial commit of styling the website --- css/styles.css | 23 +++++++++++++++++++++++ index.html | 8 +++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/css/styles.css b/css/styles.css index 8b13789..6db7503 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1 +1,24 @@ +#banner { + background-image: url('../img/milkbg.jpg'); + background-repeat: no-repeat; + background-position: center; + background-size: cover; + height: 50em; +} +#banner p { + +} + +#about-us { + background-color: rgb(211,211,211); +} + +#about-us img { + float: left; +} + +#contact-us { + background-color: rgb(25,160,207); + +} \ No newline at end of file diff --git a/index.html b/index.html index 62aa6e3..51942bf 100644 --- a/index.html +++ b/index.html @@ -4,11 +4,12 @@ Cookie Store +
-
+ -
+

About us

+
Lorem ipsum dolor sit amet, consectetur adipisicing 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 @@ -56,7 +58,7 @@

About us

-
+

Contact us

From 4171294ffe16d1507fc9eab5495bf5e5f243dbe0 Mon Sep 17 00:00:00 2001 From: Simon Mai Date: Tue, 5 Sep 2017 23:49:36 -0400 Subject: [PATCH 4/6] Complete Part 3 - styling the website --- css/styles.css | 41 +++++++++++++++++++++++++++++++++++++++-- index.html | 26 +++++++++++++------------- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/css/styles.css b/css/styles.css index 6db7503..a7abe3f 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,3 +1,6 @@ +* { + box-sizing: border-box; +} #banner { background-image: url('../img/milkbg.jpg'); background-repeat: no-repeat; @@ -6,12 +9,36 @@ height: 50em; } -#banner p { +#banner-content { + background-color: rgba(0,0,0,0.6); + border-radius: 5px; + color: #FFF; + width: 50%; + height: 50%; + position: relative; + top: 25%; + left: 25%; + text-align: center; + padding: 5%; +} +#banner-content h1 { + font-size: 600%; + font-weight: bold; +} + +#banner-content p { + font-size: 125%; +} + +#cookie-content { + text-align: center; + margin-bottom: 5px; } #about-us { - background-color: rgb(211,211,211); + background-color: rgb(211,211,211); + font-size: 125%; } #about-us img { @@ -20,5 +47,15 @@ #contact-us { background-color: rgb(25,160,207); + color: #FFF; + font-size: 125%; +} + +.title-bold { + font-weight: bold; +} +.cookie-type img { + max-width: 100%; + max-height: 100%; } \ No newline at end of file diff --git a/index.html b/index.html index 51942bf..646e7e5 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@