From 491d55d6c7b543e1aa1d5551e704df10606b5edc Mon Sep 17 00:00:00 2001 From: Christopher-Martinez-422 <107010274+Christopher-Martinez-422@users.noreply.github.com> Date: Wed, 21 Dec 2022 11:52:36 -0800 Subject: [PATCH 1/5] first commit --- index.css | 43 +++++++++++++++-- index.html | 137 ++++++++++++++++++++++++++++++++--------------------- 2 files changed, 122 insertions(+), 58 deletions(-) diff --git a/index.css b/index.css index f949e66..4ed2634 100644 --- a/index.css +++ b/index.css @@ -1,11 +1,15 @@ /*======= Create a new universal selector that changes the font color to: #3C373B */ - +*{ + color:#3C373B; + /* border: 2px solid red; */ +} h1 { font-family: 'Gaegu', cursive; margin: 20px 0; /*======= Update the font size to 60px and center the text */ - font-size: 10px; + font-size: 60px; + text-align: center; } h2, h3, h4, h5, h6 { @@ -13,7 +17,7 @@ h2, h3, h4, h5, h6 { margin-bottom: 0; padding: 0 10px; /*======= Update the font size to 30px */ - font-size: 10px; + font-size: 30px; } /*======= Create a selector for ALL p tags in the site to have the following styles: @@ -24,6 +28,12 @@ padding: 10px; line-height: 1.4; */ +p{ + font-size: 16px; + font-family: roboto; + padding: 10px; + line-height: 1.4; +} /*======= Create a selector for ALL images in the site to have the following styles: @@ -31,17 +41,21 @@ line-height: 1.4; border-radius: 10px; */ - +img{ + border-radius: 10px; +} .content-row { display: flex; } .content-row div { /*======= create a margin propery. Set the value to 20px */ + margin: 20px; } .container { /*======= create a width property. Set the value to 605px */ + width: 605px; margin: 0 auto; } @@ -55,16 +69,22 @@ line-height: 1.4; text-decoration: none; margin-bottom: 20px; /*======= create a background property. Set the value to #F87B99 */ + background: #F87B99; } .container header nav a:hover { /*======= create a background property and set it to white. Then create a color property and set it's value to pink. */ +background: white; +color: pink; } /*======= Create a selector for the about section to have the following styles: margin-top: 20px; */ +section.about{ + margin-top: 20px; +} .contact-section { border-top: 1px dashed black; @@ -80,6 +100,10 @@ line-height: 1.4; line-height: 2; */ +address{ + line-height: 2; +} + footer { width: 100%; background: #F87B99; @@ -89,6 +113,7 @@ footer { footer .footer-content { margin: 0 auto; /*======= create a width property. Set the value to 600px */ + width: 600px; } @@ -106,6 +131,11 @@ footer nav { color: black; text-decoration: underline; */ +footer a{ + margin: 10px; + color: black; + text-decoration: underline; +} footer nav a:first-child { @@ -116,7 +146,12 @@ footer nav a:first-child { color: white; */ +footer a:hover{ + color: white; +} + footer .footer-content .copyright { padding: 20px 0; /*======= center the text here */ + text-align: center; } diff --git a/index.html b/index.html index a48d8e5..2a41a69 100644 --- a/index.html +++ b/index.html @@ -4,69 +4,98 @@ + Sweet Eats Bakery - - - Sweet Eats Bakery - - - About - Cookies - Celebrations - Catering - Contact - - - +
+
+ +

Sweet Eats Bakery

+ + + +
+
+
+ +
+ Bakery Header +
- About Sweet Eats Bakery - - Marzipan jelly-o macaroon I love macaroon jujubes. Candy candy canes jujubes I love ice cream croissant. Lollipop - donut icing I love liquorice gummi bears marzipan. Dragée jelly beans apple pie cotton candy lemon drops pastry candy - powder. +
+

About Sweet Eats Bakery

+

Marzipan jelly-o macaroon I love macaroon jujubes. Candy candy canes jujubes I love ice cream croissant Lollipop donut icing I love liquorice gummi bears marzipan. Dragée jelly beans apple pie cotton candy lemon drops pastry candy powder.

+
- - - Cookies - - Cookie soufflé dessert carrot cake fruitcake halvah pudding cake. Marzipan topping bear claw soufflé gingerbread - biscuit. Tiramisu gummi bears chocolate bar sugar plum icing muffin cake jelly-o icing. - - - Celebrations - - Candy apple pie lemon drops sweet roll danish. Tiramisu candy canes jelly-o jelly beans cotton candy pastry pudding - tootsie roll carrot cake. Dessert sesame snaps brownie lemon drops cookie donut dragée. Toffee pie fruitcake powder - gingerbread pudding. - - - Catering - - Sweet jelly-o apple pie powder jelly beans. Pastry sweet roll cake jujubes halvah soufflé brownie. Toffee cookie - lemondrops jelly beans chocolate bar. Wafer muffin jujubes danish tart danish chocolate wafer. - - Contact Us - - yum@sweeteatsbakery.com - 202-555-0144 - 4209 Bobcat Drive - Madison, WI, 48219 - +
+
+ +
+ Cookies +
+
+

Cookies

+ +

Cookie soufflé dessert carrot cake fruitcake halvah pudding cake. Marzipan topping bear claw soufflé gingerbread biscuit. Tiramisu gummi bears chocolate bar sugar plum icing muffin cake jelly-o icing.

+
+
+
+
+

Celebrations

+ +

Candy apple pie lemon drops sweet roll danish. Tiramisu candy canes jelly-o jelly beans cotton candy pastry pudding tootsie roll carrot cake. Dessert sesame snaps brownie lemon drops cookie donut dragée. Toffee pie fruitcake powder gingerbread pudding.

+
+ +
+ cupcake +
+
+
+ +
+ celebrate +
+
+

Catering

+ +

Sweet jelly-o apple pie powder jelly beans. Pastry sweet roll cake jujubes halvah soufflé brownie. Toffee cookie lemondrops jelly beans chocolate bar. Wafer muffin jujubes danish tart danish chocolate wafer.

+
+
+
+
+

Contact Us

+ + yum@sweeteatsbakery.com
+ 202-555-0144 +
4209 Bobcat Drive
Madison, WI, 48219 +
+
- Sweet Eats Bakery - - About - Cookies - Celebrations - Catering - Contact - - Copyright Sweet Eats 2018 + \ No newline at end of file From 8435347cd42c9c29ecb89c0ca2a17535b5d014cb Mon Sep 17 00:00:00 2001 From: Christopher-Martinez-422 <107010274+Christopher-Martinez-422@users.noreply.github.com> Date: Thu, 22 Dec 2022 12:02:08 -0800 Subject: [PATCH 2/5] update 1 --- index.css | 24 ++++++++++++----- index.html | 77 ++++++++++++++++++++++++++---------------------------- 2 files changed, 54 insertions(+), 47 deletions(-) diff --git a/index.css b/index.css index 4ed2634..1c1dd3d 100644 --- a/index.css +++ b/index.css @@ -3,6 +3,11 @@ color:#3C373B; /* border: 2px solid red; */ } +body{ + width:50%; + text-align: center; + margin: auto +} h1 { font-family: 'Gaegu', cursive; @@ -18,6 +23,7 @@ h2, h3, h4, h5, h6 { padding: 0 10px; /*======= Update the font size to 30px */ font-size: 30px; + } /*======= Create a selector for ALL p tags in the site to have the following styles: @@ -30,7 +36,7 @@ line-height: 1.4; */ p{ font-size: 16px; - font-family: roboto; + font-family: 'roboto'; padding: 10px; line-height: 1.4; } @@ -59,7 +65,7 @@ img{ margin: 0 auto; } -.container header nav a { +header nav a { margin: 0 10px; border: 1px solid lightgray; padding: 20px; @@ -73,7 +79,7 @@ img{ } -.container header nav a:hover { +header nav a:hover { /*======= create a background property and set it to white. Then create a color property and set it's value to pink. */ background: white; color: pink; @@ -82,13 +88,15 @@ color: pink; /*======= Create a selector for the about section to have the following styles: margin-top: 20px; */ -section.about{ +.about{ margin-top: 20px; + } .contact-section { border-top: 1px dashed black; padding: 20px 0; + text-align: left; } .contact-section h2 { @@ -110,11 +118,11 @@ footer { border-top: 1px dashed white; } -footer .footer-content { - margin: 0 auto; +.footer-content { + /* margin: 0 auto; */ /*======= create a width property. Set the value to 600px */ width: 600px; - + text-align: left; } footer .footer-content h3 { @@ -135,6 +143,8 @@ footer a{ margin: 10px; color: black; text-decoration: underline; + display: inline-block; + margin: 0 10px; } diff --git a/index.html b/index.html index 2a41a69..ffe8ccc 100644 --- a/index.html +++ b/index.html @@ -10,11 +10,10 @@ -
-
+ -

Sweet Eats Bakery

- +

Sweet Eats Bakery

+
+ + + Bakery Header + +
+

About Sweet Eats Bakery

+ +

Marzipan jelly-o macaroon I love macaroon jujubes. Candy candy canes jujubes I love ice cream croissant Lollipop donut icing I love liquorice gummi bears marzipan. Dragée jelly beans apple pie cotton candy lemon drops pastry candy powder.

+
-
-
- -
- Bakery Header -
- -
-

About Sweet Eats Bakery

-

Marzipan jelly-o macaroon I love macaroon jujubes. Candy candy canes jujubes I love ice cream croissant Lollipop donut icing I love liquorice gummi bears marzipan. Dragée jelly beans apple pie cotton candy lemon drops pastry candy powder.

-
-
@@ -45,8 +41,7 @@

About Sweet Eats Bakery

Cookies

- -

Cookie soufflé dessert carrot cake fruitcake halvah pudding cake. Marzipan topping bear claw soufflé gingerbread biscuit. Tiramisu gummi bears chocolate bar sugar plum icing muffin cake jelly-o icing.

+

Cookie soufflé dessert carrot cake fruitcake halvah pudding cake. Marzipan topping bear claw soufflé gingerbread biscuit. Tiramisu gummi bears chocolate bar sugar plum icing muffin cake jelly-o icing.

@@ -71,31 +66,33 @@

Catering

Sweet jelly-o apple pie powder jelly beans. Pastry sweet roll cake jujubes halvah soufflé brownie. Toffee cookie lemondrops jelly beans chocolate bar. Wafer muffin jujubes danish tart danish chocolate wafer.

-
-
-

Contact Us

+
+

Contact Us

- yum@sweeteatsbakery.com
- 202-555-0144 -
4209 Bobcat Drive
Madison, WI, 48219 -
-
+ yum@sweeteatsbakery.com
+ 202-555-0144 +
4209 Bobcat Drive
Madison, WI, 48219 +
+
- + \ No newline at end of file From 51d70c4a7160c61c73bbc14deb7794c7dc0749a2 Mon Sep 17 00:00:00 2001 From: Christopher-Martinez-422 <107010274+Christopher-Martinez-422@users.noreply.github.com> Date: Thu, 22 Dec 2022 12:14:05 -0800 Subject: [PATCH 3/5] hopefully the last one --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index ffe8ccc..20ce683 100644 --- a/index.html +++ b/index.html @@ -46,7 +46,7 @@

Cookies

-

Celebrations

+

Celebrations

Candy apple pie lemon drops sweet roll danish. Tiramisu candy canes jelly-o jelly beans cotton candy pastry pudding tootsie roll carrot cake. Dessert sesame snaps brownie lemon drops cookie donut dragée. Toffee pie fruitcake powder gingerbread pudding.

@@ -61,7 +61,7 @@

Celebrations

celebrate
-

Catering

+

Catering

Sweet jelly-o apple pie powder jelly beans. Pastry sweet roll cake jujubes halvah soufflé brownie. Toffee cookie lemondrops jelly beans chocolate bar. Wafer muffin jujubes danish tart danish chocolate wafer.

@@ -88,7 +88,7 @@

Sweet Eats Bakery

-

Copyright Sweet Eats 2018

+

Copyright Sweet Eats 2018

From 2a59c64cd3c2b4ad842a165d8f2c43a9d9978f9c Mon Sep 17 00:00:00 2001 From: Christopher-Martinez-422 <107010274+Christopher-Martinez-422@users.noreply.github.com> Date: Thu, 22 Dec 2022 12:16:12 -0800 Subject: [PATCH 4/5] actual last one --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 20ce683..7dcf523 100644 --- a/index.html +++ b/index.html @@ -40,7 +40,7 @@

About Sweet Eats Bakery

Cookies
-

Cookies

+

Cookies

Cookie soufflé dessert carrot cake fruitcake halvah pudding cake. Marzipan topping bear claw soufflé gingerbread biscuit. Tiramisu gummi bears chocolate bar sugar plum icing muffin cake jelly-o icing.

From 5ed8740c838c3612cd004e677ca5b851493afda0 Mon Sep 17 00:00:00 2001 From: Christopher-Martinez-422 <107010274+Christopher-Martinez-422@users.noreply.github.com> Date: Thu, 22 Dec 2022 12:18:37 -0800 Subject: [PATCH 5/5] for real this time --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 7dcf523..2e8affb 100644 --- a/index.html +++ b/index.html @@ -77,7 +77,7 @@

Contact Us