-
Notifications
You must be signed in to change notification settings - Fork 6.3k
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
Marcos WEBPTSept2024 #4358
Open
marco238
wants to merge
10
commits into
ironhack-labs:master
Choose a base branch
from
marco238:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Marcos WEBPTSept2024 #4358
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
0b27402
Hecho para 24¨
marco238 c111ed0
2nd recipe
marco238 55ecab8
feat: also works on 13¨
marco238 dfefd24
1280 to 1366
marco238 d12ffb3
...
marco238 7b63915
....
marco238 b7aee01
fix: 2 styles for diferent screen sizes
marco238 a405479
done
marco238 49f535f
fix: 100vh instead of 1000px
marco238 39f34d4
just finished step 1
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
/*Some necessary adjustments*/ | ||
h1, body, html, main { | ||
margin: 0; | ||
} | ||
/*Import the font and set the default size*/ | ||
html { | ||
font-family: 'Open Sans', sans-serif; | ||
font-size: 18px | ||
} | ||
|
||
/* | ||
.apples { | ||
display: block; | ||
width: 100%; | ||
margin: auto; | ||
} | ||
*/ | ||
hr { | ||
width: 80%; | ||
margin: 50px auto; | ||
border-width: 3px; | ||
} | ||
|
||
.container { | ||
position: relative; | ||
height: 100vh; | ||
background-image: url('../images/apple-pie.jpg'); | ||
background-repeat: no-repeat; | ||
background-size: 1920px auto; | ||
} | ||
|
||
.center { | ||
color: #fff; | ||
position: absolute; | ||
top: 45%; | ||
left: 50%; | ||
transform: translate(-50%, -50%); | ||
font-size: 150px; | ||
} | ||
|
||
.description { | ||
font-size: 2.4em; | ||
width: 80%; | ||
margin: 140px auto 0 auto; | ||
} | ||
|
||
.data { | ||
width: 35%; | ||
margin: 80px auto 50px auto; | ||
} | ||
|
||
.data img { | ||
width: 100%; | ||
margin: 0 auto; | ||
} | ||
|
||
.list { | ||
width: 80%; | ||
margin: 0 auto; | ||
} | ||
|
||
h1 { | ||
font-size: 2.5em; | ||
margin: 60px 0; | ||
} | ||
|
||
li { | ||
font-size: 200%; | ||
} | ||
|
||
ul { | ||
list-style-type: none; | ||
} | ||
|
||
.thirdSection { | ||
margin-bottom: 180px; | ||
} | ||
|
||
@media screen and (max-width:1400px) { | ||
.description { | ||
font-size: 160%; | ||
} | ||
|
||
.center { | ||
font-size: 550%; | ||
} | ||
|
||
.container { | ||
height: 700px; | ||
background-size: 1400px auto; | ||
} | ||
|
||
li { | ||
font-size: 130%; | ||
} | ||
|
||
h1 { | ||
font-size: 190%; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,43 +1,66 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
<head> | ||
<title>French Onion Soup Recipe</title> | ||
<!-- Google fonts gives us access to the Open Sans Font --> | ||
<!-- Google fonts is also awesome! Make sure to check it out --> | ||
<title>French Onion Soup</title> | ||
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,600" rel="stylesheet"> | ||
<link href="css/main.css" rel="stylesheet"> | ||
</head> | ||
<body> | ||
French Onion Soup | ||
|
||
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 | ||
<body> | ||
|
||
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. | ||
<section class="firstSection"> | ||
<div class="container"> | ||
<!--<img class="soup" src="images/soup.jpg" alt="Apples on a wooden table">--> | ||
<div class="center">French Onion Soup</div> | ||
</div> | ||
<p class="description">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.</p> | ||
<div class="data"> | ||
<img src="images/recipe-info.png"> | ||
</div> | ||
<hr> | ||
</section> | ||
|
||
Add beef broth, sherry and thyme. Season with salt and pepper, and simmer for 30 | ||
minutes. | ||
<section class="secondSection"> | ||
<div class="list"> | ||
<h1>Ingredients</h1> | ||
<ul> | ||
<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> | ||
</div> | ||
<div class="data"> | ||
<img src="images/cooking-info.png"> | ||
</div> | ||
<hr> | ||
</section> | ||
|
||
Heat the oven broiler. | ||
<section class="thirdSection"> | ||
<div class="list"> | ||
<h1>Directions</h1> | ||
<ul> | ||
<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.</li> | ||
</ul> | ||
</div> | ||
</section> | ||
|
||
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> | ||
</html> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
n0 nro noooo este size mejor a 24px
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok ok lo reviso