Skip to content

Blackberry #43

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 22 additions & 0 deletions lesson_07/apple_content.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<style>
@import url('https://fonts.googleapis.com/css2?family=Lato&family=Overlock:wght@700&display=swap');
body{font-family: 'Lato', sans-serif;
text-align: center;
color: white;
}
h3{
font-family: 'Overlock', cursive;
font-size: 28px;
margin: 0px;
padding-top: 10px;
}
p{
font-size: 16px;
padding: 0px;
}
</style>

<h3>Apple</h3>

<p>An apple tree is a small to medium-sized deciduous tree known for its edible fruit, the apple. These trees typically grow to around 30 feet tall and wide. They have oval-shaped, dark green leaves with a serrated edge, and in the spring, they produce white to pale pink blossoms. The fruit, which matures in the fall, can be green, yellow, or red, and is typically about 2-4 inches in diameter.</p>

33 changes: 33 additions & 0 deletions lesson_07/apple_summary.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<style>body{font-family:'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
color: white;}</style>
<style>
@import url('https://fonts.googleapis.com/css2?family=Lato&family=Overlock:wght@700&display=swap');
body{font-family: 'Lato', sans-serif;
text-align: center;
}
h3{
font-family: 'Overlock', cursive;
font-size: 26px;
margin: 0px;
padding-top: 10px;

}
p{
font-size: 15px;
padding: 0px;
}
#type{
font-size: 12px;
margin: 0;
padding: 0;
margin-bottom: 10px;
}
</style>


<h3>Apple</h3>

<p id="type">Deciduous fruit tree</p>
<img src="img/apple.jpg" style="width: 200px;">
<p>Family: Rosaceae, sub-family pomoideae</p>

25 changes: 25 additions & 0 deletions lesson_07/cherry_content.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<style>
@import url('https://fonts.googleapis.com/css2?family=Lato&family=Overlock:wght@700&display=swap');
body{font-family: 'Lato', sans-serif;
text-align: center;
color: white;

}
h3{
font-family: 'Overlock', cursive;
font-size: 28px;
margin: 0px;
padding-top: 10px;
}
p{
font-size: 16px;
padding: 0px;
}
</style>
<h3>Cherry</h3>

<p>A cherry is the fruit of many plants of the genus Prunus, and is a fleshy drupe (stone fruit).</p>

<p>Commercial cherries are obtained from cultivars of several species, such as the sweet Prunus avium and the sour Prunus cerasus. The name 'cherry' also refers to the cherry tree and its wood, and is sometimes applied to almonds and visually similar flowering trees in the genus Prunus, as in "ornamental cherry" or "cherry blossom". Wild cherry may refer to any of the cherry species growing outside cultivation, although Prunus avium is often referred to specifically by the name "wild cherry" in the British Isles.</p>


36 changes: 36 additions & 0 deletions lesson_07/cherry_summary.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<style>body{font-family:'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
color: white;}</style>
<style>
@import url('https://fonts.googleapis.com/css2?family=Lato&family=Overlock:wght@700&display=swap');
body{font-family: 'Lato', sans-serif;
text-align: center;
}
h3{
font-family: 'Overlock', cursive;
font-size: 26px;
margin: 0px;
padding-top: 10px;

}
p{
font-size: 15px;
padding: 0px;
}
#type{
font-size: 12px;
margin: 0;
padding: 0;
margin-bottom: 10px;

}
</style>

<h3>Cherry</h3>

<p id="type"> Tree </p>
<img src="img/cherry.jpg" style="width: 200px;">

<p>Family: Rosaceae</p>



Empty file.
Empty file.
Binary file added lesson_07/img/cherryblossom.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 12 additions & 3 deletions lesson_07/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ <h1>The Tree Encyclopedia</h1>
<h3>Index</h3>
<p><button id="oak">Oak</button></p>
<p><button id="beech">Beech</button></p>

<p><button id="cherry">Cherry</button></p>
<p><button id="apple">Apple</button></p>
</div>
<div class="content">
<iframe id="i_content" src="oak_content.html"
Expand All @@ -50,10 +51,18 @@ <h3>Index</h3>
$("#i_summary").attr("src","oak_summary.html");
})
$("#beech").click(function(){


$("#i_content").attr("src","beech_content.html");
$("#i_summary").attr("src","beech_summary.html");
})
$("#apple").click(function(){
$("#i_content").attr("src","apple_content.html");
$("#i_summary").attr("src","apple_summary.html");
})

$("#cherry").click(function(){
$("#i_content").attr("src","cherry_content.html");
$("#i_summary").attr("src","cherry_summary.html");
})
/* This will not be merged ! */


Expand Down
4 changes: 2 additions & 2 deletions lesson_07/oak_content.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@

<h3>Oak</h3>

<p>There are approximately 500 extant species of oaks.[2] The common name "oak" also appears in the names of species in related genera, notably Lithocarpus (stone oaks), as well as in those of unrelated species such as Grevillea robusta (silky oaks) and the Casuarinaceae (she-oaks). </p>
<p>There are approximately 500 extant species of oaks. The common name "oak" also appears in the names of species in related genera, notably Lithocarpus (stone oaks), as well as in those of unrelated species such as Grevillea robusta (silky oaks) and the Casuarinaceae (she-oaks). </p>

<p>The genus Quercus is native to the Northern Hemisphere, and includes deciduous and evergreen species extending from cool temperate to tropical latitudes in the Americas, Asia, Europe, and North Africa. North America contains the largest number of oak species, with approximately 90 occurring in the United States, while Mexico has 160 species of which 109 are endemic. The second greatest center of oak diversity is China, which contains approximately 100 species.[3]</p>
<p>The genus Quercus is native to the Northern Hemisphere, and includes deciduous and evergreen species extending from cool temperate to tropical latitudes in the Americas, Asia, Europe, and North Africa. North America contains the largest number of oak species, with approximately 90 occurring in the United States, while Mexico has 160 species of which 109 are endemic. The second greatest center of oak diversity is China, which contains approximately 100 species.</p>
39 changes: 39 additions & 0 deletions lesson_08/blackberry.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Blackberry</title>
<link rel="stylesheet" href="style.css">
</head>
<body>

<div class="container">
<h1 class="title">Blackberry</h1>
<div class="description">
Our blackberry ice cream is really good and even has little chunks of blackberry in it.
Did you know that the banana is botanically speaking a berry?

Here are some of the countries where blackberries grow:

<!-- I think there is something wrong in this part -->

<ul>
<li>India</li>
<li>China</li>
<li>Phillipines</li>
<li>Ecuador</li>
<li>Indonesia</li>
</ul>

<!-- I think there is something wrong in this part -->

<img src="img/Thornless_Blackberry_1.webp">

<a href="index.html"><button type="button">Back</button></a>

</div>
</div>

</body>
</html>
10 changes: 5 additions & 5 deletions lesson_08/grapefruit.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ <h1 class="title">Grapefruit</h1>
<!-- I think there is something wrong in this part -->

<ul>
<li>China</ul>
<lii>Vietnam</li>
<li>China</li>
<li>Vietnam</li>
<li>United States</li>
<li>Mexico</li>
<li>South Africa</li
</ol>
<li>South Africa</li>
</ul>

<!-- ---------------------------------------------t -->

<img src="">
<img src="img/grapefruit.jpg">

<a href="index.html"><button type="button">Back</button></a>

Expand Down
Binary file added lesson_08/img/Thornless_Blackberry_1.webp
Binary file not shown.
1 change: 1 addition & 0 deletions lesson_08/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ <h2 class="subtitle">These are our flavors:</h2>
<p class="flavor"><a href="orange.html">Orange</a></p>
<p class="flavor"><a href="strawberry.html">Strawberry</a></p>
<p class="flavor"><a href="pistachio.html">Pistachio</a></p>
<p class="flavor"><a href="blackberry.html">Blackberry</a></p>
</div>
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion lesson_08/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ img{
}

body{
background-color:beige;
background-color:pink;
}