diff --git a/lesson_06/team.html b/lesson_06/team.html index 4bb4728..daa0a02 100644 --- a/lesson_06/team.html +++ b/lesson_06/team.html @@ -31,14 +31,17 @@

John Mastercoder

-
- +

Tony Lin

+
+ +
+

Danny S

- +

"(╯°□°)╯︵ ┻━┻"

@@ -73,4 +76,4 @@

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

Dead Bush

+ +

a Dead Bush (Twig) is a genus of deciduous trees in the family youdidnottakecareofitproperly, native everywhere. Recent classifications recognize that they are all dead.

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

Dead Bush

+ +

Tree

+ + +

Family: youdidnottakecareofitproperly

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

Tree

+ +

just any Tree

+ + + + diff --git a/lesson_07/Tree_summary.html b/lesson_07/Tree_summary.html new file mode 100644 index 0000000..36868a7 --- /dev/null +++ b/lesson_07/Tree_summary.html @@ -0,0 +1,34 @@ + + + +

Tree

+ +

Tree

+ + +

Family: Trees

+ \ No newline at end of file diff --git a/lesson_07/img/dead bush.jpg b/lesson_07/img/dead bush.jpg new file mode 100644 index 0000000..3169ca7 Binary files /dev/null and b/lesson_07/img/dead bush.jpg differ diff --git a/lesson_07/index.html b/lesson_07/index.html index 7eb0fd4..0c5b182 100644 --- a/lesson_07/index.html +++ b/lesson_07/index.html @@ -24,6 +24,8 @@

The Tree Encyclopedia

Index

+

+

@@ -33,7 +35,7 @@

Index

-
@@ -51,8 +53,16 @@

Index

}) $("#beech").click(function(){ + $("#i_content").attr("src","beech_content.html"); + $("#i_summary").attr("src","beech_summary.html"); }) + $("#Dead").click(function(){ + $("#i_content").attr("src","DeadBush_content.html"); + $("#i_summary").attr("src","DeadBush_summary.html"); + + }) + /* This will not be merged ! */ diff --git a/lesson_07/willow_content.html b/lesson_07/willow_content.html new file mode 100644 index 0000000..e69de29 diff --git a/lesson_07/willow_summary.html b/lesson_07/willow_summary.html new file mode 100644 index 0000000..e69de29 diff --git a/lesson_08/banana.html b/lesson_08/banana.html index a67ebba..cba9b5b 100644 --- a/lesson_08/banana.html +++ b/lesson_08/banana.html @@ -31,8 +31,8 @@

Banana

India
  • China
  • Phillipines
  • -
  • Ecuador

    -
  • Indonesia +
  • Ecuador
  • +
  • Indonesia
  • diff --git a/lesson_08/chocolate.html b/lesson_08/chocolate.html index 391a643..20da791 100644 --- a/lesson_08/chocolate.html +++ b/lesson_08/chocolate.html @@ -11,7 +11,7 @@

    Chocolate

    - >> + Our chocolate ice cream is really good, made with real cacao ! diff --git a/lesson_08/coconut.html b/lesson_08/coconut.html index acfc28e..160fd6a 100644 --- a/lesson_08/coconut.html +++ b/lesson_08/coconut.html @@ -25,7 +25,7 @@

    Coconut

    - +
    diff --git a/lesson_08/grapefruit.html b/lesson_08/grapefruit.html index 104e9fb..8efda02 100644 --- a/lesson_08/grapefruit.html +++ b/lesson_08/grapefruit.html @@ -18,15 +18,16 @@

    Grapefruit

    - Vietnam +
  • Vietnam
  • United States
  • Mexico
  • -
  • South Africa
  • + +
  • South Africa
  • + - + diff --git a/lesson_08/mango.html b/lesson_08/mango.html index fd50cee..e255eb9 100644 --- a/lesson_08/mango.html +++ b/lesson_08/mango.html @@ -11,7 +11,7 @@
    -

    +

    Mango

    Our mango ice cream is very fresh tasting and has a nice, appealing orange color. We use fresh mangos for our mango ice cream. diff --git a/lesson_08/strawberry.html b/lesson_08/strawberry.html index f57e43b..28ce960 100644 --- a/lesson_08/strawberry.html +++ b/lesson_08/strawberry.html @@ -17,19 +17,19 @@

    Strawberry

    - +
    • China
    • United States
    • -
    • Mexico +
    • Mexico
    • Egypt
    • -
    • +
    • Turkey
    - + - +