diff --git a/apple-pie/index.html b/apple-pie/index.html index a019c8262..1922ac853 100644 --- a/apple-pie/index.html +++ b/apple-pie/index.html @@ -4,6 +4,7 @@ Apple Pie Recipe +<<<<<<< HEAD @@ -35,5 +36,62 @@ 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. +======= + + + + +
+

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

+ recipe information +
+

Ingredients

+ + cooking information +
+

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. +
  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. +
  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. +
    4. +
+>>>>>>> 420e47e (solution) diff --git a/apple-pie/styles/style.css b/apple-pie/styles/style.css index 7a55b4df4..43c1ddbc4 100644 --- a/apple-pie/styles/style.css +++ b/apple-pie/styles/style.css @@ -4,21 +4,82 @@ html { box-sizing: border-box; font-size: 16px; } +<<<<<<< HEAD *, *:before, *:after { box-sizing: inherit; } body, h1, h2, h3, h4, h5, h6, p, ol, ul { +======= +*, +*:before, +*:after { + box-sizing: inherit; +} +body, +h1, +h2, +h3, +h4, +h5, +h6, +p, +ol, +ul { +>>>>>>> 420e47e (solution) margin: 0; padding: 0; font-weight: lighter; } +<<<<<<< HEAD +======= +>>>>>>> 420e47e (solution) /* Set the font */ body { font-family: "Helvetica", sans-serif; } +<<<<<<< HEAD /* STYLES */ -/* Write your CSS below */ \ No newline at end of file +/* Write your CSS below */ +======= +/* STYLES */ +/* Write your CSS below */ +#recipe-name { + background-image: url("../images/apple-pie.jpg"); + height: 700px; +} +h1 { + color: white; + text-align: center; + padding-top: 20%; + font-size: 48px; +} +p { + color: gray; + margin: 40px 15%; + font-size: 20px; +} +.info { + width: 30%; + margin: 40px 35%; +} +.hor-line { + border-top: 3px solid #bbb; +} +ul, +ol { + font-size: 20px; + color: gray; + margin: 40px 17%; +} +.headers { + font-size: 30px; + margin: 40px 15%; +} +ol > li::marker { + content: counter(list-item) ") "; +} +>>>>>>> 420e47e (solution) diff --git a/french-soup/index.html b/french-soup/index.html index 9eb587ee6..02621aad1 100644 --- a/french-soup/index.html +++ b/french-soup/index.html @@ -4,6 +4,7 @@ French Onion Soup Recipe +<<<<<<< HEAD @@ -17,5 +18,56 @@ 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. +======= + + + +
+

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

+ info about recipe +
+

Ingredients

+ + cooking information +
+

Directions

+
    +
  1. + 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. +
  2. + Add beef broth, sherry and thyme. Season with salt and pepper, and + simmer for 30 minutes. +
    3. +
  3. Heat the oven broiler.
    4. +
  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. +
    5. +
+>>>>>>> 420e47e (solution) diff --git a/french-soup/styles/style.css b/french-soup/styles/style.css index 51ac59e60..36835276f 100644 --- a/french-soup/styles/style.css +++ b/french-soup/styles/style.css @@ -1,3 +1,4 @@ +<<<<<<< HEAD /*Some necessary adjustments*/ h1, body, html, main { margin: 0; @@ -6,4 +7,82 @@ h1, body, html, main { html { font-family: 'Open Sans', sans-serif; font-size: 18px +======= +.title { + background-image: url("/french-soup/images/soup.jpg"); + height: 700px; + background-size: cover; + background-position: center; + background-repeat: no-repeat; + margin: 0; + padding: 0; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + color: white; + font-size: 48px; +} +body { + margin: 0; + padding: 0; +} +.description { + padding: 0 90px; + margin: 20px auto; + font-size: 20px; + line-height: 1.5; + color: grey; +} +img { + display: block; + margin-left: auto; + margin-right: auto; +} +.Ingredients { + font-size: 32px; + padding: 0 90px; + margin: 20px auto; + font-size: 20px; + line-height: 1.5; + font-weight: bold; +} +ul { + list-style: none; + padding: 0 90px; + margin: 20px auto; + font-size: 20px; + line-height: 1.5; + color: grey; +} +.directions { + font-size: 32px; + padding: 0 90px; + margin: 20px auto; + font-size: 20px; + line-height: 1.5; + font-weight: bold; +} +ol > li::marker { + content: counter(list-item) ") "; +} +ol { + padding: 0 90px; + margin: 20px auto; + font-size: 20px; + line-height: 1.5; + color: grey; + list-style: none; +} +hr { + border: none; + height: 2px; + background-color: black; + width: 88%; + margin: 20px auto; +} +html { + font-family: "Open Sans", sans-serif; + font-size: 18px; +>>>>>>> 420e47e (solution) }