From 6bff2ba6927dfa91f324301393811a4e11838482 Mon Sep 17 00:00:00 2001 From: William Marroush Date: Wed, 19 Mar 2025 14:08:41 -0400 Subject: [PATCH 1/6] firstchange --- index.html | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/index.html b/index.html index eae824d..37822a4 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,8 @@ + + Cookie Store @@ -14,22 +16,30 @@

Cookie Store

Our Cookies

Checkout our latest and delicious cookies.

- -

Mint Chocolate

-

Tasty mint chocolate cookies

- A single mint chocolate cookie - -

Peanut Butter

-

Yummy peanut buttery goodness

- A single peanut butter cookie - -

Oatmeal

-

Your fitness instructors favorite

- A single oatmeal cookie - -

Chocolate Chip

-

Gooey chocolate you'll love

- A single chocolate chip cookie +
+
+
+

Mint Chocolate

+

Tasty mint chocolate cookies

+ A single mint chocolate cookie +
+
+

Peanut Butter

+

Yummy peanut buttery goodness

+ A single peanut butter cookie +
+
+

Oatmeal

+

Your fitness instructors favorite

+ A single oatmeal cookie +
+
+

Chocolate Chip

+

Gooey chocolate you'll love

+ A single chocolate chip cookie +
+
+

About us

From 19e42523434c8ad2922dc35330f7c8afa36621ad Mon Sep 17 00:00:00 2001 From: William Marroush Date: Wed, 19 Mar 2025 14:12:27 -0400 Subject: [PATCH 2/6] text centering simple --- index.html | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 37822a4..9fb30e9 100644 --- a/index.html +++ b/index.html @@ -9,11 +9,13 @@
-

Cookie Store

-

Buy our awesome cookies. All proceeds go to charity!

+
+

Cookie Store

+

Buy our awesome cookies. All proceeds go to charity!

+
-
+

Our Cookies

Checkout our latest and delicious cookies.

@@ -41,10 +43,11 @@

Chocolate Chip

-
+ +

About us

- illustrations of two people baking + illustrations of two people baking
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim From 42bafed66d5342a599dfa89c8b53db05a44ed24a Mon Sep 17 00:00:00 2001 From: William Marroush Date: Thu, 20 Mar 2025 12:03:58 -0400 Subject: [PATCH 3/6] PROGRESS! Working with header css on personal styles.css sheet --- css/styles.css | 18 ++++++++++++++++++ index.html | 28 +++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/css/styles.css b/css/styles.css index 3c3f2b6..1b45ec8 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1 +1,19 @@ /* Add custom css styles here */ +header{ + background-image: url("/images/coffee-biscuits.jpg") ; + background-repeat: no-repeat; + background-size:100%; + color:#b3935a; + height:400px; +} +.headerdiv{ + display:flex; + flex-direction:column; + justify-content: center; + align-items:center; + width:90%; + max-width:650px; + height:70%; + margin: 0 auto; + background-color:#00000025; +} \ No newline at end of file diff --git a/index.html b/index.html index 9fb30e9..c278070 100644 --- a/index.html +++ b/index.html @@ -3,13 +3,24 @@ + + + + Cookie Store +
-
+ + + +

Cookie Store

Buy our awesome cookies. All proceeds go to charity!

@@ -18,27 +29,34 @@

Cookie Store

Our Cookies

Checkout our latest and delicious cookies.

+ +
+

Mint Chocolate

Tasty mint chocolate cookies

- A single mint chocolate cookie + + A single mint chocolate cookie

Peanut Butter

Yummy peanut buttery goodness

- A single peanut butter cookie + A single peanut butter cookie

Oatmeal

Your fitness instructors favorite

- A single oatmeal cookie + A single oatmeal cookie

Chocolate Chip

Gooey chocolate you'll love

- A single chocolate chip cookie + A single chocolate chip cookie
From b7bb806b397a343b7ae436034bb77e72935d2add Mon Sep 17 00:00:00 2001 From: William Marroush Date: Thu, 20 Mar 2025 15:28:44 -0400 Subject: [PATCH 4/6] new branch to finish part 2 --- css/styles.css | 13 ++++++++----- index.html | 31 +++++++++++++++++-------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/css/styles.css b/css/styles.css index 1b45ec8..30b300e 100644 --- a/css/styles.css +++ b/css/styles.css @@ -2,18 +2,21 @@ header{ background-image: url("/images/coffee-biscuits.jpg") ; background-repeat: no-repeat; - background-size:100%; - color:#b3935a; + background-size:cover; + color:#e4ca9e; height:400px; } .headerdiv{ + font-family:'Courier New', Courier, monospace; + font-size:large; display:flex; flex-direction:column; justify-content: center; align-items:center; - width:90%; + width:80%; max-width:650px; - height:70%; + min-width: 300px; + height:40%; margin: 0 auto; - background-color:#00000025; + background-color:#0000007c; } \ No newline at end of file diff --git a/index.html b/index.html index c278070..443cf6f 100644 --- a/index.html +++ b/index.html @@ -13,14 +13,14 @@ -
+
-
+

Cookie Store

Buy our awesome cookies. All proceeds go to charity!

@@ -62,18 +62,21 @@

Chocolate Chip

-
-

About us

- - illustrations of two people baking -
- 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

+
+
+ illustrations of two people baking +
+ 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. +
From 4a625045bd44a10072cb9309f3b9c88f87ee8617 Mon Sep 17 00:00:00 2001 From: William Marroush Date: Thu, 20 Mar 2025 15:45:31 -0400 Subject: [PATCH 5/6] part2.2 finished. starting 2.3 --- css/styles.css | 16 ++++++++++++++++ index.html | 11 ++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/css/styles.css b/css/styles.css index 30b300e..aedeeca 100644 --- a/css/styles.css +++ b/css/styles.css @@ -19,4 +19,20 @@ header{ height:40%; margin: 0 auto; background-color:#0000007c; +} +.footdown{ + background-color:#0000007c; +} +.bakerimg{ + height:40%; + width:80%; + max-width:100px; + margin:0 auto; +} +footer{ + background-color:#a6a4ee; + display:flex; + flex-direction:column; + align-items:center; + justify-content:center; } \ No newline at end of file diff --git a/index.html b/index.html index 443cf6f..bedd864 100644 --- a/index.html +++ b/index.html @@ -20,7 +20,7 @@ -
+

Cookie Store

Buy our awesome cookies. All proceeds go to charity!

@@ -62,12 +62,12 @@

Chocolate Chip

-
+
-

About us

+

About us

- illustrations of two people baking + illustrations of two people baking
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim @@ -79,7 +79,8 @@

About us

-
+ +

Contact us

100 Broadway Avenue,
From 907c279407fc7f5681c90008674dc59f550e409e Mon Sep 17 00:00:00 2001 From: WilliamMarroush Date: Fri, 21 Mar 2025 16:03:11 -0400 Subject: [PATCH 6/6] Part 2.3 complete. Part 2 as a whole complete --- css/styles.css | 20 +++++++++++++++++--- index.html | 10 +++++----- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/css/styles.css b/css/styles.css index aedeeca..e367b9d 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,4 +1,7 @@ /* Add custom css styles here */ +*{ + font-family:'Times New Roman', Times, serif; +} header{ background-image: url("/images/coffee-biscuits.jpg") ; background-repeat: no-repeat; @@ -6,8 +9,18 @@ header{ color:#e4ca9e; height:400px; } +h1, h2, h3{ + font-weight: bold; + text-decoration:underline; +} +.descriptorus{ + text-align-last: end; +} +.cookiebox{ + height:50%; + margin-bottom: 3%; +} .headerdiv{ - font-family:'Courier New', Courier, monospace; font-size:large; display:flex; flex-direction:column; @@ -21,7 +34,7 @@ header{ background-color:#0000007c; } .footdown{ - background-color:#0000007c; + background-color:#b8b8b844; } .bakerimg{ height:40%; @@ -30,7 +43,8 @@ header{ margin:0 auto; } footer{ - background-color:#a6a4ee; + color:white; + background-color:#6e6bd1; display:flex; flex-direction:column; align-items:center; diff --git a/index.html b/index.html index bedd864..74982d7 100644 --- a/index.html +++ b/index.html @@ -26,7 +26,7 @@

Cookie Store

-
+

Our Cookies

Checkout our latest and delicious cookies.

@@ -62,12 +62,12 @@

Chocolate Chip

-
-
-

About us

+
+
+

About us

- illustrations of two people baking + illustrations of two people baking
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim