From 0b27402c64275560c256b41d5fb482e025b2f953 Mon Sep 17 00:00:00 2001 From: Marcos Monzon Date: Fri, 27 Oct 2017 05:45:34 +0200 Subject: [PATCH 01/10] =?UTF-8?q?Hecho=20para=2024=C2=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apple-pie-starter-code/css/main.css | 77 +++++++++++++++++++ .../apple-pie-starter-code/index.html | 73 ++++++++++++------ 2 files changed, 127 insertions(+), 23 deletions(-) diff --git a/starter-code/apple-pie-starter-code/css/main.css b/starter-code/apple-pie-starter-code/css/main.css index e69de29bb..a12a5e458 100644 --- a/starter-code/apple-pie-starter-code/css/main.css +++ b/starter-code/apple-pie-starter-code/css/main.css @@ -0,0 +1,77 @@ +/*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: 1000px; + background-image: url('../images/apple-pie.jpg'); + background-repeat: no-repeat; + background-size: 1920px auto; +} + +.center { + color: #fff; + position: absolute; + top: 40%; + 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; +} diff --git a/starter-code/apple-pie-starter-code/index.html b/starter-code/apple-pie-starter-code/index.html index 9c85ce748..0bd7f812d 100644 --- a/starter-code/apple-pie-starter-code/index.html +++ b/starter-code/apple-pie-starter-code/index.html @@ -2,34 +2,61 @@ Apple Pie Recipe + + -Apple Pies -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 +
+
+ +
Apple Pie
+
+

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!

+
+ +
+
+
-Directions -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. +
+
+

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
    • +
+
+
+ +
+
+
-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. +
+
+

Directions

+
    +
  • 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.
    • +
  • 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.
    • +
  • 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.
    • +
+
+
-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. From c111ed0f855c3a4a6683f5ce99d8162c07fb3475 Mon Sep 17 00:00:00 2001 From: Marcos Monzon Date: Fri, 27 Oct 2017 15:40:52 +0200 Subject: [PATCH 02/10] 2nd recipe --- .../apple-pie-starter-code/css/main.css | 2 +- .../css/main.css | 70 ++++++++++++++++ .../french-onion-soup-starter-code/index.html | 84 ++++++++++++------- 3 files changed, 124 insertions(+), 32 deletions(-) diff --git a/starter-code/apple-pie-starter-code/css/main.css b/starter-code/apple-pie-starter-code/css/main.css index a12a5e458..4aceae118 100644 --- a/starter-code/apple-pie-starter-code/css/main.css +++ b/starter-code/apple-pie-starter-code/css/main.css @@ -32,7 +32,7 @@ hr { .center { color: #fff; position: absolute; - top: 40%; + top: 45%; left: 50%; transform: translate(-50%, -50%); font-size: 150px; diff --git a/starter-code/french-onion-soup-starter-code/css/main.css b/starter-code/french-onion-soup-starter-code/css/main.css index 51ac59e60..6a617307b 100644 --- a/starter-code/french-onion-soup-starter-code/css/main.css +++ b/starter-code/french-onion-soup-starter-code/css/main.css @@ -7,3 +7,73 @@ html { font-family: 'Open Sans', sans-serif; font-size: 18px } + +/* +.soup { + display: block; + width: 100%; + margin: auto; +} +*/ +hr { + width: 80%; + margin: 50px auto; + border-width: 3px; +} + +.container { + position: relative; + height: 1000px; + background-image: url('../images/soup.jpg'); + background-repeat: no-repeat; + background-size: 1920px auto; +} + +.center { + width: 70%; + text-align: 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; +} diff --git a/starter-code/french-onion-soup-starter-code/index.html b/starter-code/french-onion-soup-starter-code/index.html index 0b1526144..59945953a 100644 --- a/starter-code/french-onion-soup-starter-code/index.html +++ b/starter-code/french-onion-soup-starter-code/index.html @@ -1,43 +1,65 @@ - French Onion Soup Recipe - - + French Onion Soup + - 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. +
+
+ +
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 +
+
+

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. +
+
+

Directions

+
    +
  • 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.
    • +
  • 2) Add beef broth, sherry and thyme. Season with salt and pepper, and simmer for 30 + minutes.
    • +
  • 3) Heat the oven broiler.
    • +
  • 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.
    • +
+
+
-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 -(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. From 55ecab8f5600b38c3eedd2c9af2fb180fb55f743 Mon Sep 17 00:00:00 2001 From: Marcos Monzon Date: Fri, 27 Oct 2017 16:10:36 +0200 Subject: [PATCH 03/10] =?UTF-8?q?feat:=20also=20works=20on=2013=C2=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apple-pie-starter-code/css/main.css | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/starter-code/apple-pie-starter-code/css/main.css b/starter-code/apple-pie-starter-code/css/main.css index 4aceae118..52116d444 100644 --- a/starter-code/apple-pie-starter-code/css/main.css +++ b/starter-code/apple-pie-starter-code/css/main.css @@ -75,3 +75,26 @@ ul { .thirdSection { margin-bottom: 180px; } + +@media screen and (max-width:1280px) { + .description { + font-size: 160%; + } + + .center { + font-size: 550%; + } + + .container { + height: 700px; + background-size: 1280px auto; + } + + li { + font-size: 130%; + } + + h1 { + font-size: 190%; + } +} From dfefd24aa0e6939e54688550de5bb472a0d87d29 Mon Sep 17 00:00:00 2001 From: Marcos Monzon Date: Fri, 27 Oct 2017 16:15:15 +0200 Subject: [PATCH 04/10] 1280 to 1366 --- starter-code/apple-pie-starter-code/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starter-code/apple-pie-starter-code/css/main.css b/starter-code/apple-pie-starter-code/css/main.css index 52116d444..3be2e16bc 100644 --- a/starter-code/apple-pie-starter-code/css/main.css +++ b/starter-code/apple-pie-starter-code/css/main.css @@ -76,7 +76,7 @@ ul { margin-bottom: 180px; } -@media screen and (max-width:1280px) { +@media screen and (max-width:1366px) { .description { font-size: 160%; } From d12ffb3a0dc1e35af2a3245bd8928abec2ed55f2 Mon Sep 17 00:00:00 2001 From: Marcos Monzon Date: Fri, 27 Oct 2017 16:16:58 +0200 Subject: [PATCH 05/10] ... --- starter-code/apple-pie-starter-code/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starter-code/apple-pie-starter-code/css/main.css b/starter-code/apple-pie-starter-code/css/main.css index 3be2e16bc..88dd28468 100644 --- a/starter-code/apple-pie-starter-code/css/main.css +++ b/starter-code/apple-pie-starter-code/css/main.css @@ -87,7 +87,7 @@ ul { .container { height: 700px; - background-size: 1280px auto; + background-size: 1366px auto; } li { From 7b6391544bd1e9981a1f68b5841238d16c132dcd Mon Sep 17 00:00:00 2001 From: Marcos Monzon Date: Fri, 27 Oct 2017 16:20:30 +0200 Subject: [PATCH 06/10] .... --- starter-code/apple-pie-starter-code/css/main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/starter-code/apple-pie-starter-code/css/main.css b/starter-code/apple-pie-starter-code/css/main.css index 88dd28468..bbc8459f6 100644 --- a/starter-code/apple-pie-starter-code/css/main.css +++ b/starter-code/apple-pie-starter-code/css/main.css @@ -76,7 +76,7 @@ ul { margin-bottom: 180px; } -@media screen and (max-width:1366px) { +@media screen and (max-width:1400px) { .description { font-size: 160%; } @@ -87,7 +87,7 @@ ul { .container { height: 700px; - background-size: 1366px auto; + background-size: 1400px auto; } li { From b7aee01cf275878043765354bbc169e7842a50a0 Mon Sep 17 00:00:00 2001 From: Marcos Monzon Date: Fri, 27 Oct 2017 16:26:47 +0200 Subject: [PATCH 07/10] fix: 2 styles for diferent screen sizes --- .../css/main.css | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/starter-code/french-onion-soup-starter-code/css/main.css b/starter-code/french-onion-soup-starter-code/css/main.css index 6a617307b..3300d535c 100644 --- a/starter-code/french-onion-soup-starter-code/css/main.css +++ b/starter-code/french-onion-soup-starter-code/css/main.css @@ -77,3 +77,26 @@ ul { .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%; + } +} From a405479c37052f9662fb4ab8ee4a6149bd45c784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Monz=C3=B3n?= Date: Fri, 27 Oct 2017 16:29:48 +0200 Subject: [PATCH 08/10] done --- starter-code/french-onion-soup-starter-code/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starter-code/french-onion-soup-starter-code/css/main.css b/starter-code/french-onion-soup-starter-code/css/main.css index 3300d535c..0f14f199f 100644 --- a/starter-code/french-onion-soup-starter-code/css/main.css +++ b/starter-code/french-onion-soup-starter-code/css/main.css @@ -80,7 +80,7 @@ ul { @media screen and (max-width:1400px) { .description { - font-size: 160%; + font-size: 170%; } .center { From 49f535f4af41dceef834403065c8d7edd1936c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Monz=C3=B3n?= Date: Sat, 28 Oct 2017 14:45:50 +0200 Subject: [PATCH 09/10] fix: 100vh instead of 1000px --- starter-code/apple-pie-starter-code/css/main.css | 2 +- starter-code/french-onion-soup-starter-code/css/main.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/starter-code/apple-pie-starter-code/css/main.css b/starter-code/apple-pie-starter-code/css/main.css index bbc8459f6..ca9e5940d 100644 --- a/starter-code/apple-pie-starter-code/css/main.css +++ b/starter-code/apple-pie-starter-code/css/main.css @@ -23,7 +23,7 @@ hr { .container { position: relative; - height: 1000px; + height: 100vh; background-image: url('../images/apple-pie.jpg'); background-repeat: no-repeat; background-size: 1920px auto; diff --git a/starter-code/french-onion-soup-starter-code/css/main.css b/starter-code/french-onion-soup-starter-code/css/main.css index 0f14f199f..597ab5e54 100644 --- a/starter-code/french-onion-soup-starter-code/css/main.css +++ b/starter-code/french-onion-soup-starter-code/css/main.css @@ -23,7 +23,7 @@ hr { .container { position: relative; - height: 1000px; + height: 100vh; background-image: url('../images/soup.jpg'); background-repeat: no-repeat; background-size: 1920px auto; From 39f34d4e9271de42798d111dcc32d8d6d726733f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Monz=C3=B3n?= Date: Wed, 11 Sep 2024 21:34:08 +0200 Subject: [PATCH 10/10] just finished step 1 --- starter-code/french-onion-soup-starter-code/css/main.css | 2 +- starter-code/french-onion-soup-starter-code/index.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/starter-code/french-onion-soup-starter-code/css/main.css b/starter-code/french-onion-soup-starter-code/css/main.css index 597ab5e54..55317b622 100644 --- a/starter-code/french-onion-soup-starter-code/css/main.css +++ b/starter-code/french-onion-soup-starter-code/css/main.css @@ -5,7 +5,7 @@ h1, body, html, main { /*Import the font and set the default size*/ html { font-family: 'Open Sans', sans-serif; - font-size: 18px + font-size: 18px; } /* diff --git a/starter-code/french-onion-soup-starter-code/index.html b/starter-code/french-onion-soup-starter-code/index.html index 59945953a..a1961434a 100644 --- a/starter-code/french-onion-soup-starter-code/index.html +++ b/starter-code/french-onion-soup-starter-code/index.html @@ -5,6 +5,7 @@ +