diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..13cbc8c Binary files /dev/null and b/.DS_Store differ diff --git a/lesson_06/.vscode/settings.json b/lesson_06/.vscode/settings.json new file mode 100644 index 0000000..6f3a291 --- /dev/null +++ b/lesson_06/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "liveServer.settings.port": 5501 +} \ No newline at end of file diff --git a/lesson_06/team.html b/lesson_06/team.html index 4bb4728..62cc304 100644 --- a/lesson_06/team.html +++ b/lesson_06/team.html @@ -33,40 +33,25 @@

- - +

>

+

Kenda

-
- - -
- +

Matt Lynch

-
- - -
- -
- - -
- + Yami Awesome
-
- - -
+ + diff --git a/lesson_07/cherry_content.html b/lesson_07/cherry_content.html new file mode 100644 index 0000000..ad1a1f9 --- /dev/null +++ b/lesson_07/cherry_content.html @@ -0,0 +1,23 @@ + + +

Cherry

+ +

Cherry wood is a type of hardwood that comes from the cherry tree, a species of tree that belongs to the Rosaceae family. There are two main types of cherry trees used for woodworking: the black cherry tree and the wild cherry tree. Both trees produce high-quality lumber, but the black cherry tree is more commonly used due to its larger size and greater availability. (From Custom Country Woods)

+ +

Cherry is debatably one of the most beautiful American hardwood species. Its rich reddish color makes it easily recognizable to just about anyone. Cherry is a deciduous hardwood with broad leaves that drop in the fall and have seeds that are contained in ovaries. All deciduous trees are hardwoods. Cherry primarily grows in the eastern half of the USA, with the best stands of cherry being found in the Appalachian region. Cherry trees typically grow to 60-80 feet tall and about 2-3’ at DBH (diameter at breast height.) (From Kretz Lumber, Written by Jessica Becker)

\ No newline at end of file diff --git a/lesson_07/cherry_summary.html b/lesson_07/cherry_summary.html new file mode 100644 index 0000000..8923812 --- /dev/null +++ b/lesson_07/cherry_summary.html @@ -0,0 +1,32 @@ + + + + +

Cherry

+ +

Tree

+ +

Family: Rosaceae

\ No newline at end of file diff --git a/lesson_07/index.html b/lesson_07/index.html index 7eb0fd4..6cf4262 100644 --- a/lesson_07/index.html +++ b/lesson_07/index.html @@ -23,7 +23,10 @@

The Tree Encyclopedia

Index

-

+

+

+
@@ -50,7 +53,20 @@

Index

$("#i_summary").attr("src","oak_summary.html"); }) $("#beech").click(function(){ + $("#i_content").attr("src","beech_content.html"); + $("#i_summary").attr("src","beech_summary.html"); + + }) + $("#maple").click(function(){ + $("#i_content").attr("src","maple_content.html"); + $("#i_summary").attr("src","maple_summary.html"); + + + }) + $("#cherry").click(function(){ + $("#i_content").attr("src","cherry_content.html"); + $("#i_summary").attr("src","cherry_summary.html"); }) diff --git a/lesson_07/maple_content.html b/lesson_07/maple_content.html new file mode 100644 index 0000000..e376bd1 --- /dev/null +++ b/lesson_07/maple_content.html @@ -0,0 +1,25 @@ + +

Maple

+ +

Acer is a genus of trees and shrubs commonly known as maples. The genus is placed in the soapberry family Sapindaceae. There are approximately 132 species, most of which are native to Asia, with a number also appearing in Europe, northern Africa, and North America. Only one species, Acer laurinum, extends to the Southern Hemisphere.

+ +

The type species of the genus is the sycamore maple Acer pseudoplatanus, one of the most common maple species in Europe. Most maples usually have easily identifiable palmate leaves (with a few exceptions, such as Acer carpinifolium, Acer laurinum, and Acer negundo) and all share distinctive winged fruits.

+ + \ No newline at end of file diff --git a/lesson_07/maple_summary.html b/lesson_07/maple_summary.html new file mode 100644 index 0000000..c91a2df --- /dev/null +++ b/lesson_07/maple_summary.html @@ -0,0 +1,36 @@ + + + +

Maple

+ +

Tree

+ + +

Family: Soapberry Family

+ + + \ No newline at end of file diff --git a/lesson_08/.DS_Store b/lesson_08/.DS_Store new file mode 100644 index 0000000..63d69ac Binary files /dev/null and b/lesson_08/.DS_Store differ diff --git a/lesson_08/.vscode/settings.json b/lesson_08/.vscode/settings.json new file mode 100644 index 0000000..f673a71 --- /dev/null +++ b/lesson_08/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "liveServer.settings.port": 5502 +} \ No newline at end of file diff --git a/lesson_08/chocolate.html b/lesson_08/chocolate.html index 391a643..31654d2 100644 --- a/lesson_08/chocolate.html +++ b/lesson_08/chocolate.html @@ -8,12 +8,10 @@ -

Chocolate

- >> +
Our chocolate ice cream is really good, made with real cacao ! - Here are some of the countries where cacao is harvested: @@ -25,7 +23,7 @@

Chocolate

  • Ghana
    • - + diff --git a/lesson_08/img/matcha.jpg b/lesson_08/img/matcha.jpg new file mode 100644 index 0000000..70d4aba Binary files /dev/null and b/lesson_08/img/matcha.jpg differ diff --git a/lesson_08/img/raspberry.png b/lesson_08/img/raspberry.png new file mode 100644 index 0000000..7af3922 Binary files /dev/null and b/lesson_08/img/raspberry.png differ diff --git a/lesson_08/index.html b/lesson_08/index.html index 08f4589..5351950 100644 --- a/lesson_08/index.html +++ b/lesson_08/index.html @@ -9,6 +9,7 @@

    Welcome to our ice cream store

    +

    Testing...

    These are our flavors:

    diff --git a/lesson_08/mango.html b/lesson_08/mango.html index fd50cee..5c4e2f9 100644 --- a/lesson_08/mango.html +++ b/lesson_08/mango.html @@ -11,10 +11,10 @@
    -

    - +

    Mango Icecream

    +
    Our mango ice cream is very fresh tasting and has a nice, appealing orange color. - We use fresh mangos for our mango ice cream. + We use fresh mangos for our mango ice cream.
    @@ -27,8 +27,9 @@

  • Pakistan
    • - + +

    diff --git a/lesson_08/matcha.html b/lesson_08/matcha.html new file mode 100644 index 0000000..fffa589 --- /dev/null +++ b/lesson_08/matcha.html @@ -0,0 +1,35 @@ + + + + + + Matcha + + + + +
    +

    Matcha

    +
    + Our matcha ice cream has a nice earthy yet sweet flavor. + We use only high quality matcha in our ice cream. + + Here are some of the countries where matcha is produced. + +
      + Japan +
    • China
      • +
    + + + + + +
    +
    + + + + + + diff --git a/lesson_08/raspberry.html b/lesson_08/raspberry.html new file mode 100644 index 0000000..734b112 --- /dev/null +++ b/lesson_08/raspberry.html @@ -0,0 +1,42 @@ + + + + + + Lemon + + + + +
    +

    Raspberry

    +
    + Our raspberry ice cream is very fresh tasting and especially nice in the summer. + We use fresh raspberry for our raspberry ice cream. + + Here are some of the countries where raspberry are harvested: + + + +
      +
    • Ukraine
      • +
    • France
      • +
    • Germany
      • +
    • Russia
      • +
    • Canada
      • +
    + + + + + + + +
    +
    + + + + + +