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

Sapphire - Ana S, Ariel W, Kathleen S #36

Open
wants to merge 45 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
38be2b8
created coworking agreement
anasilverx May 16, 2023
b1fad50
Added HTML to facts.html file. Specifically added: h1, two nav links …
arielwilliams May 16, 2023
244e490
created styles folder and sytle css file for generic stylings
anasilverx May 16, 2023
df0e133
Added HTML to gallery.html file. Added h1, nav links, header, footer
kathleenshin May 16, 2023
8b0401f
fixed merged. changed live server port to 5502
anasilverx May 16, 2023
b4dd68c
Added an h2 tag and an unordered list with three bullet points for fu…
arielwilliams May 16, 2023
cce9044
Added gallery images
kathleenshin May 16, 2023
99f663d
Added images and alt text to gallery page
kathleenshin May 16, 2023
53f1d27
added team members names to home page
anasilverx May 16, 2023
738ef7d
added navigation link to facts page and gallery page
anasilverx May 16, 2023
5de9b27
Fixed pina colada image relative path
kathleenshin May 16, 2023
9069b6c
Merge branch 'main' of https://github.com/kathleenshin/group-fansite
anasilverx May 16, 2023
5dfbca4
created a css file to modify index specifically
anasilverx May 17, 2023
b2e2e7d
Update spacing and indentations in gallery.html
kathleenshin May 17, 2023
91cc193
extra styling for all pages
anasilverx May 17, 2023
372849c
Merge branch 'main' of https://github.com/kathleenshin/group-fansite
anasilverx May 17, 2023
f51843a
Created gallery.css
kathleenshin May 17, 2023
b95fd38
Created facts.css file.
arielwilliams May 17, 2023
408981f
Merge branch 'main' of https://github.com/kathleenshin/group-fansite
kathleenshin May 17, 2023
366dd19
Updated indentation
kathleenshin May 17, 2023
9e84039
Updated link tag to style.css
kathleenshin May 17, 2023
7e42bc6
Added link tag for style.css in the facts.html file.
arielwilliams May 17, 2023
18c25d4
Added link to gallery.css
kathleenshin May 17, 2023
1b87992
Resized all images
kathleenshin May 17, 2023
fd329c2
Centered all images
kathleenshin May 17, 2023
11677aa
Removed bullet point from images
kathleenshin May 17, 2023
5b40095
Add rounded corners to images
kathleenshin May 17, 2023
f4c6ef8
Add space between each image
kathleenshin May 17, 2023
2e74a54
Override background color to lavender blush
kathleenshin May 17, 2023
194e0e4
Wrote css in facts.css to make some changes to the facts page. Create…
arielwilliams May 17, 2023
2691d6b
Merge branch 'main' of https://github.com/kathleenshin/group-fansite
arielwilliams May 17, 2023
10b4342
changes style for index html
anasilverx May 17, 2023
f484d3a
Updated background color to lavender blush for all pages
kathleenshin May 17, 2023
3193325
imported google fonts to apply yo home page header and to apply to al…
anasilverx May 17, 2023
ffe1a8f
Add images
kathleenshin May 18, 2023
c5df789
Add new images to html
kathleenshin May 18, 2023
85c018e
implemented grid display to have required wireframe layout
anasilverx May 18, 2023
f40b804
Moved links to home page and gallery to the bottom of the page and ce…
arielwilliams May 19, 2023
db23adc
Moved down copyright below links in the center bottom of the page. Ce…
arielwilliams May 19, 2023
795ca2d
Removed comments in facts.css
arielwilliams May 19, 2023
dc0c584
created container with a max with and a margin 0 auto so the containe…
arielwilliams May 19, 2023
de0c895
implemented grid and flex display to layout, added footer navbar, cen…
kathleenshin May 19, 2023
d8900ac
fixed layout for navigation menu. added more styling to home page
anasilverx May 19, 2023
bd1d1dd
Merge branch 'main' of https://github.com/kathleenshin/group-fansite
anasilverx May 19, 2023
1bf3f04
created more styling for the home page. made nav menu equal on all pages
anasilverx May 19, 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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5502
}
46 changes: 46 additions & 0 deletions coworking-agreement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Coworking Agreement
*Talk through each section with your partner. Add notes on what you discussed and agreed upon in each section. At the bottom, type your names to sign off on your agreement.*

## Accessibility Needs
*What does each team member need access to in order to succeed and show up the best they can?*
Ana: summarize tasks at hand, punctuality
Kathleen: need time to process.
Ariel: slow down before jumping in to take time to read directions on my own, patience


## Collaboration vs. individual work expectations
*Clarify your collaboration expectations- does your group want to write code together all of the time? Or divide work to do independently, then come together to share accomplishments? What tools and technologies can help your collaboration?*
We will work together to set up the HTML on the main page. Then we will each individually create our own page and come together for help, to discuss, and share ideas.


## Learning Style
*How does each team member learn best in project settings?*
Ana: take time to digest the info and make sense of it and talk it out to have overall understanding
Kathleen: come together after completing each smaller task and making sure we are all on the same page
Ariel: visuals are really important when you are discussing code and how it shows up on the front end


## Preferred Feedback Style
*How does each team member best receive feedback?*
Ana: don’t give the answer right away, leave some time for you to figure it out on your own
Kathleen: direct feedback, some time to figure it out on your own and you are still stuck reaching out for help. If you are stubborn, ask if help is needed.
Ariel: if going down a rabbit hole, help recenter and ask guiding questions to get me back on track.


## One Team Communication Skill to Improve
*What is a teamwork-related skill you want to work on?*
Ana: time management, managing tasks for each day so we can complete the project, not being side side-tracked
Kathleen: Being proactive about checking in whether that is because I’m struggling or I’ve figured out what I am trying to do.
Ariel: checking in with the group so I don’t get behind, making sure I check with others to make sure we are all at the same checkpoint at the end of every task


## Optional: Other agreements
*Other co-working agreements that were not captured in the above sections.*
Enjoy the learning experience. Don’t forget to have fun. Don’t take it home.
Signatures

Ariel Williams,
Ana Silvera,
Kathleen Shin
Date: _May 16, 2023________

Binary file added images/el-duderino-milk-punch.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/fruity-pebbles-milk-punch.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/lavender-earl-grey-milk-punch.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/miami-vice-milk-punch.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/milk-lady-milk-punch.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/pina-colada-milk-punch.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/pumpkin-spice-latte-milk-punch.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/tita-nitas-milk-punch.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/vodka-black-tea-milk-punch.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 59 additions & 10 deletions pages/facts.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,61 @@
<!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>Milk Punchies Facts</title>
<link rel="stylesheet" href="../styles/style.css" />
<link rel="stylesheet" href="../styles/facts.css" />
</head>
<body>
<div class="header-container">
<header>
<h1>Fun Facts Page</h1>
</header>
</div>

<main>
<div class="container">
<h2>Fun Facts About Clarified Milk Punch:</h2>
<ul>
<li>
<p>
Clarified Milk Punch is a forgotten classic cocktail! This
cocktail requires a lot of time and space which is why it's not
commonly found on bar menus.
</p>
</li>
<li>
<p>
How does it transform from opaque to clear?! The citrus interacts
with the milk which causes it to curdle. Then you pour the liquid
through a strainer which leaves behind the curdles and other solid
ingredients. This leaves behind the beautiful clear liquid of the
gods!
</p>
</li>
<li>
<p id="abv-mystery">
How much alcohol is in a milk punch? Milk punch is an ABV mystery!
Drink at your own risk!
</p>
</li>
</ul>
</div>
</main>
<footer>
<nav class="links-container">
<a href="index.html">Home Page</a> |
<a href="gallery.html">Gallery Page</a>
</nav>
<div class="footer-container">
<h4>&copy;The Milk Punch Website Copyright 2023</h4>
</div>
</footer>
</body>
</html>

<!-- header and links can be children to a div to be a container main 1 container -->

<!-- nav main footer are siblings and direct children to body -->
53 changes: 43 additions & 10 deletions pages/gallery.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,45 @@
<!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 rel="stylesheet" href="../styles/style.css" />
<link rel="stylesheet" href="../styles/gallery.css" />
</head>
<body>
<header class="header-container">
<h1>
Gallery Page
</h1>
</header>
<nav class="nav-container">
<a href="index.html">Home Page</a>
<a href="facts.html">Facts Page</a>
<a href="https://food52.com/drinks/spirits-liquor/27796-history-of-milk-punch">History</a>
</nav>
<div class="images-container">
<ul>
<li><img src="../images/fruity-pebbles-milk-punch.jpg" alt="Fruity Pebbles Milk Punch"></li>
<li><img src="../images/miami-vice-milk-punch.jpg" alt="Miami Vice Milk Punch"></li>
<li><img src="../images/pina-colada-milk-punch.jpg" alt="Pina Colada Milk Punch"></li>
<li><img src="../images/el-duderino-milk-punch.jpg" alt="El Duderino Milk Punch"></li>
<li><img src="../images/lavender-earl-grey-milk-punch.jpeg" alt="Lavender Earl Grey Milk Punch"></li>
<li><img src="../images/milk-lady-milk-punch.jpg" alt="Milk Lady Milk Punch"></li>
<li><img src="../images/pumpkin-spice-latte-milk-punch.jpg" alt="Pumpkin Spice Latte Milk Punch"></li>
<li><img src="../images/tita-nitas-milk-punch.jpg" alt="Tita Nitas Milk Punch"></li>
<li><img src="../images/vodka-black-tea-milk-punch.jpg" alt="Vodka Black Tea Milk Punch"></li>
</ul>
</div>
<div class="footer-links-container">
<a href="index.html">Home Page</a>
<a href="facts.html">Facts Page</a>
<a href="https://food52.com/drinks/spirits-liquor/27796-history-of-milk-punch">History</a>
</div>
<footer class="footer-container">
<h4>&copy; The Milk Punch Website Copyright 2023</h4>
</footer>
</body>
</html>
34 changes: 33 additions & 1 deletion pages/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,41 @@
<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>Milk Punchies Home Page</title>
<link rel="stylesheet" href="../styles/style.css">
<link rel="stylesheet" href="../styles/index.css">
</head>

<body>
<div class="container">
<nav>
<a class="nav-target" href="index.html">Home Page</a>
<a class="nav-target" href="facts.html">Fun Facts!</a>
<a class="nav-target" href="gallery.html">Gallery Page</a>
</nav>


<main class="content-container">
<h1 class="page-header">Milk Punch: The Forgotten Classic Cocktail</h1>
<section>
<p>
Picture this: milk and alcohol.
You heard that right! Not to worry my lactase-deficient friends.
Milk punch is a delightful cocktail artisanally made from milk and spices, magically reduced down into a wonderully clear alcocholic beverage.
Learn more about it on this website.
</p>
</section>
</main>

<footer>
<div class="links-container">
<a href="https://www.thecarlile.com/menu/cocktail-culture/">Find Milk Punch in Seattle</a>
<a href="https://www.bittersandbottles.com/products/rockeys-milk-punch">Buy Milk Punch Online</a>
<a href="https://www.youtube.com/watch?v=X17NxjRPeb4&ab_channel=TheWeePearl">Make Your Own Milk Punch</a>
</div>
<h4>&copy; The Milk Punch Website Copyright 2023</h4>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yay HTML character entities! Glad to see y'all use it

</footer>
</div>

</body>
</html>
45 changes: 45 additions & 0 deletions styles/facts.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
h1 {
font-size: 100px;
overflow: hidden;
white-space: nowrap;
text-align: center;
margin: 20px;
}


h2 {
color: rgb(42, 162, 124);
font-size: 50px;
}



.footer-container h4 {
color: rgb(163, 64, 107);
}

* {
color: slateblue;
}

#abv-mystery:hover {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was also cool! and random haha. But cool!

color: red;
}



body {
display: flex;
flex-direction: column;
justify-content: space-between;
height: 100vh;
}

.container {
max-width: 1200px;
margin: 0 auto;
}

.links-container{
font-size: 30px;
}
60 changes: 60 additions & 0 deletions styles/gallery.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
h1 {
font-size: 100px;
color: lemonchiffon;
-webkit-text-stroke: 2px black;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is great!

overflow: hidden;
white-space: nowrap;
text-align: center;
padding: 1rem;
}

.images-container > ul > li > img {
display: block;
margin-left: auto;
margin-right: auto;
height: auto;
width: 300px;
text-align: center;
border-radius: 10%;
}

.images-container > ul > li {
list-style-type: none;
margin-bottom: 15px
}

.images-container {
margin: auto;
display: grid;
flex-direction: column
}

.nav-container {
margin: auto;
display: flex;
padding: 1rem;
justify-content: space-between;
width: 75%;
font-size: 30px;
}

.header-container {
margin: auto;
display: grid;
padding: 1rem
}

.footer-container {
margin: auto;
display: flex;
padding: 1rem;
justify-content: center;
}

.footer-links-container {
margin: auto;
display: flex;
padding: 2rem;
justify-content: space-between;
width: 50%
}
Loading