Skip to content

BCN-0419-Allyn Alda #13

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.

Sign up for GitHub

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

Open
allynkalda wants to merge 2 commits into
base: master
Choose a base branch
from
Open

BCN-0419-Allyn Alda #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3035211
first commit
Apr 1, 2019
1edc999
second commit
Apr 1, 2019
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
53 changes: 53 additions & 0 deletions apple-pie-starter-code/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
@import "http://fonts.googleapis.com/css?family=Open+Sans";

h1, body, html, main {
Copy link
Copy Markdown
Collaborator

@tawebbcn tawebbcn Apr 2, 2019

Choose a reason for hiding this comment

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

Maybe you could add more rules for the reset that will make the styling easier.

margin: 0;
font-family: "Open Sans", sans-serif;
}
#box-1 {
background: url(../images/apple-pie.jpg);
background-repeat: no-repeat;
background-size: cover;
height: 500px;
width: 100%;
display:flex;
align-items: center;
justify-content: center;
color:white;
}
h1 {
font-size: 60px;
}
p, h2 {
font-size: 18px;
padding-bottom: 20px;
}
#box-2 {
margin: 70px 70px 30px 70px;
}
.images {
display: block;
margin-left: auto;
margin-right: auto;
width: 45%;
padding-top: 15px;
}
.box-bottom {
margin: 50px 70px 30px 70px;
}
ul.dash {
list-style: none;
margin-left: 0;
padding-left: 1em;
}
ul.dash > li:before {
display: inline-block;
content: "-";
width: 1em;
margin-left: -1em;
}
ol {
margin-bottom: 100px;
list-style-type: none;
padding-left: 0;
}
67 changes: 45 additions & 22 deletions apple-pie-starter-code/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,57 @@
<html lang="en">
<head>
<title>Apple Pie Recipe</title>
<link rel = "stylesheet" type = "text/css" href = "./css/main.css" />
</head>
<body>
Copy link
Copy Markdown
Collaborator

@tawebbcn tawebbcn Apr 2, 2019

Choose a reason for hiding this comment

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

You are missing a basic structure of the site using the header and main tags:

<header></header>
<main></main>

And inside will go everything else. Usually you will have a footer as well.

Apple Pies
<div id="box-1">
<section>
<h1>Apple Pies</h1>
</section>
</div>
<div id="box-2">
<section>
<p>
This was my grandmother's apple pie recipe. I have never seen another one
quite like it. It will always be my favorite and has won me several first place
prizes in local competitions. I hope it becomes one of your favorites as well!

Ingredients
1 recipe pastry for a 9 inch double crust pie
1/2 cup unsalted butter
3 tablespoons all-purpose flour
1/4 cup water
3 tablespoons all-purpose flour
1/4 cup water
1/2 cup white sugar
1/2 cup packed brown sugar
8 Granny Smith apples - peeled, cored and sliced

Directions
Preheat oven to 425 degrees F (220 degrees C). Melt the butter in a saucepan. Stir in
</p>
<img class="images" src="images/recipe-info.png" alt=recipe-apple-pie>
</section>
</div>
<hr>
Copy link
Copy Markdown
Collaborator

@tawebbcn tawebbcn Apr 2, 2019

Choose a reason for hiding this comment

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

Don't use hrtags for styling. Concept of separation of responsibilities. CSS is in charge of creating space if you need to. I would only use hr for example in poetry.

<div class=box-bottom>
<section>
<h2><strong>Ingredients</strong></h2>
<ul class="dash">
<li>1 recipe pastry for a 9 inch double crust pie</li>
<li>1/2 cup unsalted butter</li>
<li>3 tablespoons all-purpose flour</li>
<li>1/4 cup water</li>
<li>3 tablespoons all-purpose flour</li>
<li>1/4 cup water</li>
<li>1/2 cup white sugar</li>
<li>1/2 cup packed brown sugar</li>
<li>8 Granny Smith apples - peeled, cored and sliced</li>
</ul>
<img class="images" src="images/cooking-info.png" alt=cooking-apple-pie>
Copy link
Copy Markdown
Collaborator

@tawebbcn tawebbcn Apr 2, 2019

Choose a reason for hiding this comment

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

Indentation!

</section>
</div>
<hr>
Copy link
Copy Markdown
Collaborator

@tawebbcn tawebbcn Apr 2, 2019

Choose a reason for hiding this comment

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

Same

<div class=box-bottom>
<section>
<h2>Directions</h2>
<ol>
<li>1) Preheat oven to 425 degrees F (220 degrees C). Melt the butter in a saucepan. Stir in
flour to form a paste. Add water, white sugar and brown sugar, and bring to a boil. Reduce
temperature and let simmer.

Place the bottom crust in your pan. Fill with apples, mounded slightly. Cover with a
temperature and let simmer.</li>
<li>2) Place the bottom crust in your pan. Fill with apples, mounded slightly. Cover with a
lattice work crust. Gently pour the sugar and butter liquid over the crust. Pour slowly so
that it does not run off.

Bake 15 minutes in the preheated oven. Reduce the temperature to 350 degrees F (175
degrees C). Continue baking for 35 to 45 minutes, until apples are soft.
that it does not run off.</li>
<li>3) Bake 15 minutes in the preheated oven. Reduce the temperature to 350 degrees F (175
degrees C). Continue baking for 35 to 45 minutes, until apples are soft.</li>
</ol>
</section>
</div>
Copy link
Copy Markdown
Collaborator

@tawebbcn tawebbcn Apr 2, 2019

Choose a reason for hiding this comment

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

Revise indentation

</body>
</html>
56 changes: 50 additions & 6 deletions french-onion-soup-starter-code/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,53 @@
/*Some necessary adjustments*/
@import "http://fonts.googleapis.com/css?family=Open+Sans";

h1, body, html, main {
margin: 0;
margin: 0;
font-family: "Open Sans", sans-serif;
}
#box-1 {
background: url(../images/soup.jpg);
background-repeat: no-repeat;
background-size: cover;
height: 500px;
width: 100%;
display:flex;
align-items: center;
justify-content: center;
color:white;
}
/*Import the font and set the default size*/
html {
font-family: 'Open Sans', sans-serif;
font-size: 18px
h1 {
font-size: 60px;
}
p, h2 {
font-size: 18px;
padding-bottom: 20px;
}
#box-2 {
margin: 70px 70px 30px 70px;
}
.images {
display: block;
margin-left: auto;
margin-right: auto;
width: 45%;
padding-top: 15px;
}
.box-bottom {
margin: 50px 70px 30px 70px;
}
ul.dash {
list-style: none;
margin-left: 0;
padding-left: 1em;
}
ul.dash > li:before {
display: inline-block;
content: "-";
width: 1em;
margin-left: -1em;
}
ol {
margin-bottom: 100px;
list-style-type: none;
padding-left: 0;
}
83 changes: 50 additions & 33 deletions french-onion-soup-starter-code/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,60 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>French Onion Soup Recipe</title>
<title>French Onion Soup Recipe</title><head>
<!-- Google fonts gives us access to the Open Sans Font -->
<!-- Google fonts is also awesome! Make sure to check it out -->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,600" rel="stylesheet">
</head>
<link rel = "stylesheet" type = "text/css" href = "./css/main.css" /></head>
<body>
French Onion Soup

We have been trying French onion soup in restaurants for years and my family
<div id="box-1">
<section></section>
<h1>French Onion Soup</h1>
</section>
</div>
<div id="box-2">
<section>
<p>We have been trying French onion soup in restaurants for years and my family
and friends agree none can compare to my recipe for taste and simplicity of
preparation.

Ingredients
1/2 cup unsalted butter
2 tablespoons olive oil
4 cups sliced onions
4 (10.5 ounce) cans beef broth
2 tablespoons dry sherry (optional)
1 teaspoon dried thyme
salt and pepper to taste
4 slices French bread
4 slices provolone cheese
2 slices Swiss cheese, diced
1/4 cup grated Parmesan cheese

Directions
Melt butter with olive oil in an 8 quart stock pot on medium heat. Add onions and
continually stir until tender and translucent. Do not brown the onions.

Add beef broth, sherry and thyme. Season with salt and pepper, and simmer for 30
minutes.

Heat the oven broiler.

Ladle soup into oven safe serving bowls and place one slice of bread on top of each
preparation.</p>
<img class="images" src="images/recipe-info.png" alt=recipe-apple-pie>
</section>
</div>
<hr>
Copy link
Copy Markdown
Collaborator

@tawebbcn tawebbcn Apr 2, 2019

Choose a reason for hiding this comment

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

Same comments as the first exercise.

<div class=box-bottom>
<section>
<h2><strong>Ingredients</strong></h2>
<ul class="dash">
<li>1/2 cup unsalted butter</li>
<li>2 tablespoons olive oil</li>
<li>4 cups sliced onions</li>
<li>4 (10.5 ounce) cans beef broth</li>
<li>2 tablespoons dry sherry (optional)</li>
<li>1 teaspoon dried thyme</li>
<li>salt and pepper to taste</li>
<li>4 slices French bread</li>
<li>4 slices provolone cheese</li>
<li>2 slices Swiss cheese, diced</li>
<li>1/4 cup grated Parmesan cheese</li>
</ul>
<img class="images" src="images/cooking-info.png" alt=cooking-french-onion>
Copy link
Copy Markdown
Collaborator

@tawebbcn tawebbcn Apr 2, 2019

Choose a reason for hiding this comment

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

Revise indentation!

</section>
</div>
<hr>
<div class=box-bottom>
<section>
<h2>Directions</h2>
<ol>
<li>1) Melt butter with olive oil in an 8 quart stock pot on medium heat. Add onions and
continually stir until tender and translucent. Do not brown the onions.</li>
<li>2) Add beef broth, sherry and thyme. Season with salt and pepper, and simmer for 30
minutes.</li>
<li>3) Heat the oven broiler.</li>
<li>4) Ladle soup into oven safe serving bowls and place one slice of bread on top of each
(bread may be broken into pieces if you prefer). Layer each slice of bread with a slice of
provolone, 1/2 slice diced Swiss and 1 tablespoon Parmesan cheese. Place bowls on
cookie sheet and broil in the preheated oven until cheese bubbles and browns slightly.
</body>
cookie sheet and broil in the preheated oven until cheese bubbles and browns slightly.</li>
</ol>
</section>
</div>
</body>
</html>