From d76c1dfe8d3d518ffdd4dc869c47478b887d954f Mon Sep 17 00:00:00 2001 From: Melissa Persaud Date: Tue, 14 Sep 2021 16:43:54 -0400 Subject: [PATCH 1/8] hello --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index e2bedec..0dfd83b 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ -

Cookie Store

+

Cookiess Store

Buy our awesome cookies. All proceeds go to charity!

From 2d7fbbb9020122b43f11fe04b187fb03cc6e82e6 Mon Sep 17 00:00:00 2001 From: Melissa Persaud Date: Tue, 14 Sep 2021 18:06:09 -0400 Subject: [PATCH 2/8] compeleted 3 and 4 requirements --- css/styles.css | 6 ++++ index.html | 83 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 61 insertions(+), 28 deletions(-) diff --git a/css/styles.css b/css/styles.css index 8b13789..c490546 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1 +1,7 @@ +*{ + text-align: center; +} +.header{ + background-image: url('img/milkbg.jpg'); +} \ No newline at end of file diff --git a/index.html b/index.html index 0dfd83b..124c251 100644 --- a/index.html +++ b/index.html @@ -2,45 +2,72 @@ Cookie Store + + + + + + + + + + +
+

Cookie Store

+

Buy our awesome cookies. All proceeds go to charity!

+
+ -

Cookiess Store

- -

Buy our awesome cookies. All proceeds go to charity!

+

The Cookies

-

The Cookies

+
+
+
+

Thin Mint Cookies

+

Tasty mint chocolate cookies

+ +
+ +
+

Peanut Butter Cookies

+

Yummy peanut buttery goodness!

+ +
-

Thin Mint Cookies

-

Tasty mint chocolate cookies

- +
+

Short Bread Cookies

+

Santa's favorite classic.

+ +
+ -

Peanut Butter Cookies

-

Yummy peanut buttery goodness!

- +
+

Smore's Cookies

+

Camp fire favorite!

+ +
+ +
+
-

Short Bread Cookies

-

Santa's favorite classic.

- +

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

Smore's Cookies

-

Camp fire favorite!

- +

Contact us

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

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 f30a0549a260a82722f03ec40480f479d3b7f691 Mon Sep 17 00:00:00 2001 From: Melissa Persaud Date: Tue, 14 Sep 2021 23:49:53 -0400 Subject: [PATCH 3/8] continued to work on project --- css/styles.css | 16 ++++++++++++++-- index.html | 45 ++++++++++++++++++++++++++++++--------------- 2 files changed, 44 insertions(+), 17 deletions(-) diff --git a/css/styles.css b/css/styles.css index c490546..d4c8aa3 100644 --- a/css/styles.css +++ b/css/styles.css @@ -2,6 +2,18 @@ text-align: center; } -.header{ - background-image: url('img/milkbg.jpg'); + +.bg{ + background-image: url('/img/milkbg.jpg'); + background-repeat: no-repeat; +} + +.bg-lightgray{ + background-color:lightgrey; + +} + +.cookie-monster{ + background-image: url('/img/cmonster.png'); + } \ No newline at end of file diff --git a/index.html b/index.html index 124c251..de17ae7 100644 --- a/index.html +++ b/index.html @@ -15,51 +15,66 @@ -
-

Cookie Store

-

Buy our awesome cookies. All proceeds go to charity!

+
+
+
+

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

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

From e65a40f34d6d26922b45e6b4b2cad28d704b8e76 Mon Sep 17 00:00:00 2001 From: Melissa Persaud Date: Wed, 15 Sep 2021 21:48:02 -0400 Subject: [PATCH 4/8] continued to work on project --- css/styles.css | 32 +++++++++++++++++++++++++++++--- index.html | 35 ++++++++++++++++++++--------------- 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/css/styles.css b/css/styles.css index d4c8aa3..0f53ca5 100644 --- a/css/styles.css +++ b/css/styles.css @@ -3,17 +3,43 @@ } -.bg{ +.bg-img{ background-image: url('/img/milkbg.jpg'); background-repeat: no-repeat; + height:50vh; + background-position:center center; } + +.transparent{ + background: rgba(0,0,0,.5); + margin-top: 10vh; + padding: 3%; + width: 30%; + margin-left:35%; +} + + +.about-us{ + text-align: left; +} + + .bg-lightgray{ background-color:lightgrey; - + display: inline; + float:left; + margin: 0; } .cookie-monster{ background-image: url('/img/cmonster.png'); -} \ No newline at end of file + +} + +.footer{ + color: white; + background-color:#28b3d6; + font-size: 1em; +} diff --git a/index.html b/index.html index de17ae7..708bb52 100644 --- a/index.html +++ b/index.html @@ -15,23 +15,23 @@ -
+
-
-

Cookie Store

-

Buy our awesome cookies. All proceeds go to charity!

+
+
+

Cookie Store

+

Buy our awesome cookies. All proceeds go to charity!

+
- -

The Cookies

-
+
-

Thin Mint Cookies

+

Thin Mint CookiesNEW

Tasty mint chocolate cookies

@@ -59,9 +59,12 @@

Smore's Cookies

-
+
-
+
+ +
+

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, @@ -75,12 +78,14 @@

About us

+
+

Contact us

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

Contact us

-
- 100 Broadway Avenue,
- New York, NY 10001
- (212) 555-1234
From bb074e7e6ca9904939bdcde1cb3b129b817ce347 Mon Sep 17 00:00:00 2001 From: Melissa Persaud Date: Wed, 15 Sep 2021 22:59:56 -0400 Subject: [PATCH 5/8] added nav bar and updated badge --- css/styles.css | 10 ++++++++++ index.html | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/css/styles.css b/css/styles.css index 0f53ca5..fdf9108 100644 --- a/css/styles.css +++ b/css/styles.css @@ -2,6 +2,16 @@ text-align: center; } +.nav{ + margin-bottom: 0; +} + +.nav-link{ + margin: 1%; + padding: 0; +} + + .bg-img{ background-image: url('/img/milkbg.jpg'); diff --git a/index.html b/index.html index 708bb52..9d098be 100644 --- a/index.html +++ b/index.html @@ -15,6 +15,16 @@ + + +
@@ -28,7 +38,7 @@

Cookie Store

The Cookies

-
+

Thin Mint CookiesNEW

From 7b3d1885b72326831cbc014d67f5c09c7335b462 Mon Sep 17 00:00:00 2001 From: Melissa Persaud Date: Thu, 16 Sep 2021 17:54:54 -0400 Subject: [PATCH 6/8] attempted to offset columns --- css/styles.css | 7 +++++++ index.html | 31 ++++++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/css/styles.css b/css/styles.css index fdf9108..c06baad 100644 --- a/css/styles.css +++ b/css/styles.css @@ -11,7 +11,14 @@ padding: 0; } +.xl{ + margin-top: 5%; +} + +.xl-img{ + margin-bottom: 5%; +} .bg-img{ background-image: url('/img/milkbg.jpg'); diff --git a/index.html b/index.html index 9d098be..0d0ee53 100644 --- a/index.html +++ b/index.html @@ -40,28 +40,29 @@

The Cookies

-
-

Thin Mint CookiesNEW

-

Tasty mint chocolate cookies

- +
+

Thin Mint CookiesNEW

+

Tasty mint chocolate cookies

+
- -
-

Peanut Butter Cookies

-

Yummy peanut buttery goodness!

+ + +
+

Peanut Butter Cookies

+

Yummy peanut buttery goodness!

-
-

Short Bread Cookies

-

Santa's favorite classic.

- +
+

Short Bread Cookies

+

Santa's favorite classic.

+
-
-

Smore's Cookies

-

Camp fire favorite!

+
+

Smore's Cookies

+

Camp fire favorite!

From 8b9cde2b97f79f86899d7bb23614bae8c933db99 Mon Sep 17 00:00:00 2001 From: Melissa Persaud Date: Thu, 16 Sep 2021 17:57:06 -0400 Subject: [PATCH 7/8] added google font --- css/styles.css | 1 + index.html | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/css/styles.css b/css/styles.css index c06baad..18beeeb 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,5 +1,6 @@ *{ text-align: center; + font-family: 'Inconsolata', monospace; } .nav{ diff --git a/index.html b/index.html index 0d0ee53..d247f2d 100644 --- a/index.html +++ b/index.html @@ -12,6 +12,10 @@ + + + + From 4633d3d10a64ede3860a33524d6637b1d509bc26 Mon Sep 17 00:00:00 2001 From: Melissa Persaud Date: Thu, 16 Sep 2021 18:30:20 -0400 Subject: [PATCH 8/8] made updates --- css/styles.css | 4 ---- index.html | 16 ++++++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/css/styles.css b/css/styles.css index 18beeeb..d663551 100644 --- a/css/styles.css +++ b/css/styles.css @@ -12,10 +12,6 @@ padding: 0; } -.xl{ - margin-top: 5%; -} - .xl-img{ margin-bottom: 5%; diff --git a/index.html b/index.html index d247f2d..b3aa239 100644 --- a/index.html +++ b/index.html @@ -45,28 +45,28 @@

The Cookies

-

Thin Mint CookiesNEW

-

Tasty mint chocolate cookies

+

Thin Mint CookiesNEW

+

Tasty mint chocolate cookies

-

Peanut Butter Cookies

-

Yummy peanut buttery goodness!

+

Peanut Butter Cookies

+

Yummy peanut buttery goodness!

-

Short Bread Cookies

-

Santa's favorite classic.

+

Short Bread Cookies

+

Santa's favorite classic.

-

Smore's Cookies

-

Camp fire favorite!

+

Smore's Cookies

+

Camp fire favorite!