Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Group 6 (Gloria, Stacey, AnBa)'s fan site #44

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
6cebc02
in class wave
staceyjo May 16, 2023
3c1f423
adjusted links in index, adjusted gallery
staceyjo May 17, 2023
aa0adc7
coworking session
staceyjo May 17, 2023
964b13b
working session files
staceyjo May 17, 2023
a1a2f30
extended working session updates
staceyjo May 17, 2023
2faaf06
changed index display image
laughtivity May 17, 2023
484594c
switched to a different display image b/c of pinterest
laughtivity May 17, 2023
451d359
added a style sheet and updated index link colors
laughtivity May 17, 2023
ee58dfa
moves style folder inside pages
staceyjo May 17, 2023
b512ecd
changes css links to reflect folder move
staceyjo May 17, 2023
4bfc992
moves styles folder to insde pages
staceyjo May 17, 2023
a55ec42
Modified the style.css to make the navigation bar and footer's positi…
ngwin-ab May 17, 2023
337fae4
testing
laughtivity May 18, 2023
9bf324d
Merge branch 'main' of https://github.com/ngwin-ab/group-fansite
laughtivity May 18, 2023
653b754
adjusts styling to gallery page
staceyjo May 18, 2023
c8572b7
revisions to gallery page styling
staceyjo May 18, 2023
c281e63
Merge branch 'main' of https://github.com/ngwin-ab/group-fansite
laughtivity May 18, 2023
6685255
""
laughtivity May 18, 2023
7bc5ee1
updates to gallery page
staceyjo May 18, 2023
425e26e
Merge branch 'main' of https://github.com/ngwin-ab/group-fansite
laughtivity May 18, 2023
521f442
adjusted navigation and page title
laughtivity May 18, 2023
87d8275
adds more images to gallery
staceyjo May 18, 2023
a72c37d
Merge branch 'main' of https://github.com/ngwin-ab/group-fansite
staceyjo May 18, 2023
7cc2d1d
updates styling to match styles.css
staceyjo May 18, 2023
32f5cb4
"accepted new changes for merge"
laughtivity May 18, 2023
51fb4a3
"some changes made"
laughtivity May 18, 2023
dd0b4fe
modified styles.css to align vertically in the middle
ngwin-ab May 18, 2023
90e70a1
Merge branch 'main' of https://github.com/ngwin-ab/group-fansite
ngwin-ab May 18, 2023
b9489d5
changed nav bar background color
ngwin-ab May 18, 2023
31b1189
adjusts gallery styling
staceyjo May 18, 2023
3d6ce3f
Merge branch 'main' of https://github.com/ngwin-ab/group-fansite
staceyjo May 18, 2023
05a51b6
text adjustment for slogan and deal. Also added the coming soon section
laughtivity May 18, 2023
6370403
adjusted for merge changes in styles.css
laughtivity May 18, 2023
b10ff43
changed navigation text color and background color
laughtivity May 18, 2023
3f99f90
changed deals banner border
laughtivity May 18, 2023
197f78b
adjustment to navigation vertical spacing
laughtivity May 18, 2023
8d11e38
Add files via upload
ngwin-ab May 22, 2023
9a75706
edited footer, added clickable social media icons to the footer
ngwin-ab May 22, 2023
16f7365
Merge branch 'main' of https://github.com/ngwin-ab/group-fansite
ngwin-ab May 22, 2023
aaf2ef9
Add files via upload
ngwin-ab May 22, 2023
88f7826
Rename baseline-facebook.svg to facebook_icon.svg
ngwin-ab May 22, 2023
01fcc79
using img tag and link the icon's svg file to img's src
ngwin-ab May 22, 2023
9f23c23
Merge branch 'main' of https://github.com/ngwin-ab/group-fansite
ngwin-ab May 22, 2023
29831e1
modified the svg file
ngwin-ab May 22, 2023
1ff0dff
added zoom on hover to the social media icons
ngwin-ab May 22, 2023
0ea2f6d
added two other interactive features to the bottom of home. Placed in…
laughtivity May 30, 2023
02a09aa
removed comments/redundant lines from index.css
laughtivity May 30, 2023
6b19ea5
added the same footer as the fun facts page
laughtivity May 30, 2023
40f80fd
added contents for facts page
ngwin-ab May 31, 2023
e7834d8
added effect on hover for nav bar
ngwin-ab May 31, 2023
70ae174
modified the hover effect on nav bar
ngwin-ab May 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/facebook_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/insta_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/twitter_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
102 changes: 100 additions & 2 deletions pages/facts.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,110 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<title>Facts</title>
<link rel="stylesheet" href="./styles/styles.css" />
<link rel="stylesheet" href="./styles/facts.css" />
</head>

<body>

<header>
<h1>Berried Treasures</h1>
<nav>
<ul>
<li>
<a href="index.html">Home</a>
</li>
<li>
<a href="gallery.html">Gallery</a>
</li>
<li>
<a href="facts.html">Fun Facts</a>
</li>
</ul>
</nav>
</header>

<main>
<h2>The History of the Chocolate Covered Strawberries</h2>
<p>
Despite the fact that chocolate has been around since 1100 BC and strawberry has been found growing wild in Italy
as early as 234 BC. It was not until a woman by the name of Lorraine Lorusso combined the two in the 1960's in her
little shop called the Stop N' Shop in Chicago. She took a tempered version of the gourmet chocolate served in Her
store dipped it with the freshest strawberries she could find into the mixture and allowed the chocolate to harden
and then displayed it for her customers. As you know it was an instant success. Since then fruit and chocolate
have been the perfect pair!
</p>

<br>

<h2>Gloria's Chocolate Covered Strawberries Recipe</h2>
<div class="flex-container">
<div class="flex-item" id="flex-item-1">
<h4>Ingredients</h4>
<ul>
<li>1 cup Belgium chocolate</li>
<li>1 pound fresh strawberries with leaves</li>
<li>Optional toppings</li>
</ul>
</div>

<div class="flex-item" id="flex-item-2">
<ol>
<li>
Cupcake ipsum dolor sit amet cookie. Croissant soufflé macaroon cake cupcake gummi bears chocolate cake.
</li>

<li>
Powder brownie sweet cheesecake wafer muffin. Halvah chocolate bar gummies shortbread cookie.
</li>

<li>
Apple pie gummies dessert chocolate cake jelly gummi bears. Gummi bears sweet oat cake apple pie halvah.
</li>

<li>
Lollipop sugar plum cake marshmallow candy canes. Powder tiramisu cake bonbon shortbread gingerbread cookie.
</li>
</ol>
</div>
</div>

<br>

<h2>Tips for Adies-approved Chocolate Covered Strawberries</h2>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
</p>
</main>

<footer>
<h4>© 2023 Group 6 Fansite</h4>
<ul>
<li>
<a href="https://facebook.com" target="_blank">
<img src="../assets/facebook_icon.svg" class="social-media-icons" />
</a>
</li>

<li>
<a href="https://instagram.com" target="_blank">
<img src="../assets/insta_icon.svg" class="social-media-icons" />
</a>
</li>

<li>
<a href="https://twitter.com/" target="_blank">
<img src="../assets/twitter_icon.svg" class="social-media-icons" />
</a>
</li>
</ul>

</footer>
</body>

</html>
154 changes: 144 additions & 10 deletions pages/gallery.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,146 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
</head>
<body>

</body>
</html>

<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Gallery</title>
<link href="./styles/styles.css" rel="stylesheet">
<link href="./styles/gallery.css" rel="stylesheet">
</head>

<body>

<header>
<h1>Berried Treasures</h1>

<nav class="navigation">
<ul>
<li>
<a href="index.html">Home</a>
</li>
<li id="gallery-link">
<a href="gallery.html">Gallery</a>
</li>
<li>
<a href="facts.html">Fun Facts</a>
</li>
</ul>

</nav>
</header>

<main class="gallery-container">
<section class="image-container">
<h3> 🍓 Dark Chocolate 🍓 </h3>
<a href=""><img alt="dark chocolate covered strawberry"
src="https://i0.wp.com/www.tasty-lowcarb.com/wp-content/uploads/2018/02/Vertical-Extreme-Closeup-f9.0-88.jpg?ssl=1" /></a>
<p>Shortbread pudding cotton candy bonbon apple pie bear claw marzipan fruitcake icing. Brownie carrot cake chocolate ice cream gummies. Macaroon sesame snaps croissant jelly-o icing jujubes sesame snaps candy.</p>
</section>

<section class="image-container">
<h3> 🍓 Milk Chocolate 🍓 </h3>
<a href=""><img alt="milk chocolate covered strawberry"
src="https://oakmontbakery.com/wp-content/uploads/2020/06/Milk-Chocolate-Dipped-Strawberries-choc-on-choc.jpg" /></a>
<p>Macaroon tiramisu jelly-o gummies jelly bear claw. Jelly beans jujubes lemon drops muffin lemon drops chocolate cake biscuit donut. Shortbread chocolate toffee bonbon sweet tootsie roll danish cake candy.</p>
</section>

<section class="image-container">
<h3> 🍓 White Chocolate 🍓 </h3>
<a href=""><img alt="white chocolate covered strawberries"
src="https://www.atablefullofjoy.com/wp-content/uploads/2022/01/white-chocolate-covered-strawberries-featured-500x500.jpg" /></a>
<p>Danish cookie tiramisu chocolate bar apple pie. Cheesecake jelly-o candy canes sweet roll chocolate cake powder gummi bears marzipan bonbon. Cookie jelly-o candy canes chocolate macaroon gummies cake cupcake. Soufflé sweet roll danish toffee sweet.</p>
</section>

<section class="image-container">
<h3> 🍓 Sprinkles 🍓 </h3>
<a href=""><img alt="chocolate covered strawberries with sprinkles"
src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQLTmv4l5fW_s3NEhlrvey9eLZkLRNas7MBlHYPbhSbbw&usqp=CAU&ec=48665698" /></a>
<p>Chocolate toffee dragée muffin lollipop candy canes pie pie. Bonbon ice cream ice cream tiramisu pudding halvah cheesecake gingerbread. Cookie apple pie jelly beans jelly-o jelly-o.</p>
</section>

<section class="image-container">
<h3> 🍓 Gold Dusted 🍓 </h3>
<a href=""><img alt="gold dusted chocolate covered strawberries"
src="https://i.pinimg.com/originals/88/98/19/8898191988c66a54cdb05a9003ab8803.jpg" /></a>
<p>Pudding sweet roll icing chocolate topping. Croissant halvah jelly-o pudding toffee sweet biscuit sweet roll sugar plum. Marshmallow cookie halvah liquorice pudding shortbread bear claw cheesecake chupa chups. Dessert brownie cupcake macaroon lemon drops icing muffin.</p>
</section>

<section class="image-container">
<h3> 🍓 Toasted Coconut Flakes 🍓 </h3>
<a href=""><img alt="coconut chocolate covered strawberries"
src="https://lifecurrentsblog.com/wp-content/uploads/2018/03/MG_3963.jpg" /></a>
<p>Gummies muffin cookie croissant toffee. Cookie jujubes donut donut tart tootsie roll liquorice topping chocolate bar. Halvah danish muffin toffee icing apple pie cotton candy dragée.</p>
</section>

<section class="image-container">
<h3> 🍓 Hazlenut 🍓 </h3>
<a href=""><img alt="hazlenut chocolate covered strawberries topped with nuts"
src="https://thesaltycooker.com/wp-content/uploads/2023/01/ChocolateHazelnutCoveredStrawberries-BLOG1-500x375.jpg" /></a>
<p>Shortbread chocolate bonbon candy candy canes cake halvah icing cotton candy. Jelly beans cookie tiramisu muffin caramels wafer cotton candy. Chocolate croissant chocolate muffin croissant sweet roll cake chocolate cupcake.</p>
</section>

<section class="image-container">
<h3> 🍓 Cookie Crumb 🍓 </h3>
<a href=""><img alt="cookie crumb chocolate covered strawberries"
src="https://assets.kraftfoods.com/recipe_images/Oreo-Strawberries-Cream-57690.jpg" /></a>
<p>Chupa chups carrot cake sweet roll shortbread wafer lollipop bonbon. Shortbread danish icing sweet roll cookie lollipop pudding gingerbread carrot cake. Lollipop cake pastry lemon drops caramels. Pastry chocolate icing sugar plum chocolate chocolate bar tart pastry pastry.</p>
</section>

<section class="image-container">
<h3> 🍓 Tuxedo 🍓 </h3>
<a href=""><img alt="tuxedo chocolate covered strawberries"
src="https://i0.wp.com/lilmisscakes.com/wp-content/uploads/2011/06/IMG_2472.jpg?ssl=1" /></a>
<p>Brownie brownie donut dragée wafer tootsie roll lemon drops gingerbread oat cake. Croissant cake powder bonbon pudding lemon drops icing gummi bears. Macaroon fruitcake soufflé brownie chocolate bar.</p>
</section>

<section class="image-container">
<h3> 🍓 Sports Themed 🍓 </h3>
<a href=""><img alt="chocolate covered strawberries with sports theme"
src="https://images.saymedia-content.com/.image/t_share/MTc0NjE4Njc3OTc3NjIyNDcz/how-to-decorate-chocolate-covered-strawberries.jpg" /></a>
<p>Fruitcake cookie tootsie roll bonbon jelly. Chupa chups gummies powder danish brownie jelly marzipan. Gingerbread pastry cheesecake gingerbread bear claw. Donut croissant topping tart cotton candy.</p>
</section>

<section class="image-container">
<h3> 🍓 Marbled 🍓 </h3>
<a href=""><img alt="covered strawberries with marbled design"
src="https://www.sugarhero.com/wp-content/uploads/2017/01/chocolate-covered-strawberries-5.jpg" /></a>
<p>Bear claw biscuit jelly beans sesame snaps marshmallow croissant jelly wafer. Jelly-o jelly beans shortbread pudding tiramisu. Cotton candy jujubes candy canes toffee apple pie chupa chups brownie apple pie gummi bears. Marshmallow dessert cake apple pie tiramisu.</p>
</section>

<section class="image-container">
<h3> 🍓 Rainbow 🍓 </h3>
<a href=""><img alt="covered strawberries with rainbow design"
src="https://i0.wp.com/makezine.com/wp-content/uploads/2015/03/Rainbow-Strawberries-1.jpg?ssl=1" /></a>
<p>Cake tootsie roll bear claw halvah chocolate cake fruitcake. Candy croissant lemon drops macaroon lemon drops marzipan shortbread biscuit. Apple pie brownie pie gingerbread carrot cake cake caramels.</p>
</section>










</main>
<footer>
<section>
<ul>
<li>
<a href="#"><img alt="email address icon" src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQqF_OTLaZdMzycYs1gnVvfsja9h65wNfVaK8trOuwUbg&usqp=CAU&ec=48665698"/></a>
</li>
<li>
<a href="#"><img alt="facebook contact" src="https://cdn-icons-png.flaticon.com/512/124/124010.png"/></a>
</li>
<li>
<a href="#"><img alt="twitter contact" src="https://static.cdn.wisestamp.com/wp-content/uploads/2020/06/flollow-me-twitter-button.png"/></a>
</li>
</ul>
</section>
<h4>© 2023 Group 6 Fansite</h4>
</footer>
</body>
</html>
81 changes: 80 additions & 1 deletion pages/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,88 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link rel="stylesheet" href="./styles/index.css"/>
<link rel="stylesheet" href="./styles/styles.css"/>
<title>Group 6 Fansite</title>
</head>
<body>
<header>
<h1>Berried Treasures</h1>
<nav>
<ul>
<!-- <li>
<a class="navigation" id="home" href="index.html">Home</a>
</li> -->
<li>
<a class="navigation" id="gallery" href="gallery.html">Gallery</a>
</li>
<li>
<a class="navigation" id="facts" href="facts.html">Fun Facts</a>
</li>
</ul>
</nav>
</header>

<main id="homepage-main">
<section class="deals">
Spend $5,000 and get free delivery on your order!
</section>

<section class="slogan">
<h2 class="slogan" id="slogan-heading">
For all the Chocolate Strawberry Lovers
</h2>
<p class="slogan" id="mission">
The strawberry and chocolate specialist bringing you the best of all worlds from the good, the sweet, and the red. Deliciously smooth belgian chocolate covering the delicately sweet and freshness of a fruit.
</p>
<p class="slogan">
Eat more fruit: It's better for your health!
</p>
</section>

<section class="interaction-images">
<a id="coming-soon">
<p>
Coming Soon!
</p>
<img alt="Patriot Holiday Strawberries Coming Soon" src="https://kidsactivitiesblog.com/wp-content/uploads/2013/06/Fourth-of-July-Chocolate-Covered-Strawberries-Dessert3-1.jpg"/>
</a>
<a id="order-form">
<p>
Order Forms (TBD)
</p>
<img alt="Order Form coming soon" src="https://i.pinimg.com/564x/a2/50/aa/a250aa8b04fd6ca5146a603ab8ce14f7.jpg" />
</a>
<a id="feedback">
<p>
Give Us Your Feedback!
</p>
<img alt="Feedback Request" src="https://cdn1.harryanddavid.com/wcsstore/HarryAndDavid/images/catalog/1530_29002c.jpg?auto=webp&optimize={medium}" />
</a>
</section>
</main>

<footer>
<h4>© 2023 Group 6 Fansite</h4>
<ul>
<li>
<a href="https://facebook.com" target="_blank">
<img src="../assets/facebook_icon.svg" class="social-media-icons"/>
</a>
</li>

<li>
<a href="https://instagram.com" target="_blank">
<img src="../assets/insta_icon.svg" class="social-media-icons"/>
</a>
</li>

<li>
<a href="https://twitter.com/" target="_blank">
<img src="../assets/twitter_icon.svg" class="social-media-icons"/>
</a>
</li>
</ul>
</footer>
</body>
</html>
Loading