From 08d1630e2327bca35e250a636ac3063b01b766ae Mon Sep 17 00:00:00 2001 From: Seng Mun Date: Wed, 6 Sep 2017 19:47:28 -0400 Subject: [PATCH 1/2] For Edgardo to check --- css/styles.css | 41 ++++++++++++++++ index.html | 129 ++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 146 insertions(+), 24 deletions(-) diff --git a/css/styles.css b/css/styles.css index 8b13789..7753196 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1 +1,42 @@ +#banner { + height: 400px; + background: url('../img/milkbg.jpg') no-repeat center #00f; + background-size: cover; + +} + +#cookiestore{ + + color: white; + font-family: "Georgia"; + font-size: 15px; + background-color: grey; + opacity:0.8; +} + +#new{ + color:red; + +} +#products{ + background : lightblue; + +} + +#img{ + float:left; +} +#about-us{ + float: right; + background-color: lightgrey; +} + +#contact-us{ + + background-color: lightgreen; +} + +.row{ + padding-bottom: 30px; +} \ No newline at end of file diff --git a/index.html b/index.html index e2bedec..831bb34 100644 --- a/index.html +++ b/index.html @@ -1,47 +1,128 @@ - Cookie Store + + + + + + + + + +Cookie Store + + + +
+ +
+

The Cookies

+
+ +
+
+
+
+

Thin Mint Cookies

+

NEW

+
+

Tasty mint chocolate cookies

+
+
+ +
+
+
-

Cookie Store

- -

Buy our awesome cookies. All proceeds go to charity!

+
+
+
+ +
+
+

Peanut Butter Cookies

+

Yummy peanut buttery goodness!

+
+
+
-

The Cookies

+
+
+
+

Short Bread Cookies

+

Santa's favorite classic.

+
+
+ +
+
-

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!

+ +
-

Smore's Cookies

-

Camp fire favorite!

- +
+
+
+ -

About us

-
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod +
+
+
+

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

Contact us

+
100 Broadway Avenue,
+ New York, NY 10001
+ (212) 555-1234 +
+
+ +
+
+
+ + From 62d9937a721f0ddbceb50a8bcadf92860632e122 Mon Sep 17 00:00:00 2001 From: Seng Mun Date: Fri, 8 Sep 2017 00:02:28 -0400 Subject: [PATCH 2/2] Second time for Edgardo to check --- index.html | 76 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/index.html b/index.html index 831bb34..cf75e83 100644 --- a/index.html +++ b/index.html @@ -31,64 +31,67 @@

Cookie Store

-
+

The Cookies

-
-
-

Thin Mint Cookies

-

NEW

-
-

Tasty mint chocolate cookies

-
-
- -
+
+
+

Thin Mint Cookies

+

NEW

+

Tasty mint chocolate cookies

+
+
+ +
+
-
- + +
-
-
- -
-
-

Peanut Butter Cookies

-

Yummy peanut buttery goodness!

-
-
+ +
+

Peanut Butter Cookies

+

Yummy peanut buttery goodness!

+
+ +
+ +
+ +
-
-
-

Short Bread Cookies

+
+
+

Short Bread Cookies

Santa's favorite classic.

-
-
+
+
+
-
+ +
-
-
+ +
+

Smore's Cookies

+

Camp fire favorite!

+
+
-
-

Smore's Cookies

-

Camp fire favorite!

- +
-
-
@@ -120,6 +123,7 @@

Contact us

+