diff --git a/homework1.txt b/homework1.txt new file mode 100644 index 0000000..ff5a6aa --- /dev/null +++ b/homework1.txt @@ -0,0 +1 @@ +This is homework 1 diff --git a/lesson_06/connore1.html b/lesson_06/connore1.html new file mode 100644 index 0000000..afc0fbb --- /dev/null +++ b/lesson_06/connore1.html @@ -0,0 +1,23 @@ + + + + + + Connor + + +
+

Connor

+

Welcome to my webpage

+

+
+ + \ No newline at end of file diff --git a/lesson_06/img/apod.webp b/lesson_06/img/apod.webp new file mode 100644 index 0000000..c607957 Binary files /dev/null and b/lesson_06/img/apod.webp differ diff --git a/lesson_06/img/cwhq_aaron.jpg b/lesson_06/img/cwhq_aaron.jpg new file mode 100644 index 0000000..9e37764 Binary files /dev/null and b/lesson_06/img/cwhq_aaron.jpg differ diff --git a/lesson_06/img/desktop.ini b/lesson_06/img/desktop.ini new file mode 100644 index 0000000..1317a63 --- /dev/null +++ b/lesson_06/img/desktop.ini @@ -0,0 +1,2 @@ +[LocalizedFileNames] +apod.webp=@apod,0 diff --git a/lesson_06/team.html b/lesson_06/team.html index 4bb4728..a1ee8e7 100644 --- a/lesson_06/team.html +++ b/lesson_06/team.html @@ -18,7 +18,6 @@ -

Team members

@@ -31,44 +30,27 @@

John Mastercoder

- -
- - -
- -
- - -
- -
- - -
- + +
+

+

Connor Eberhardt

+
+
+
- - +

Jackson C

- - +

Aaron Neme

-
- - -
- -
- +

Sinai C

- - + + diff --git a/lesson_07/img/jacaranda.jpg b/lesson_07/img/jacaranda.jpg new file mode 100644 index 0000000..5ef6c3a Binary files /dev/null and b/lesson_07/img/jacaranda.jpg differ diff --git a/lesson_07/img/palmtree.webp b/lesson_07/img/palmtree.webp new file mode 100644 index 0000000..e97c438 Binary files /dev/null and b/lesson_07/img/palmtree.webp differ diff --git a/lesson_07/index.html b/lesson_07/index.html index 7eb0fd4..b2a64c0 100644 --- a/lesson_07/index.html +++ b/lesson_07/index.html @@ -24,6 +24,9 @@

The Tree Encyclopedia

Index

+

+

+

@@ -51,9 +54,25 @@

Index

}) $("#beech").click(function(){ + $("#i_content").attr("src","beech_content.html"); + $("#i_summary").attr("src","beech_summary.html"); + + + }) + $("#rosewood").click(function(){ + $("#i_content").attr("src","rosewood_content.html"); + $("#i_summary").attr("src","rosewood_summary.html"); + }) + $("#palmtree").click(function() { + $("#i_content").attr("src", "palmtree_content.html"); + $("#i_summary").attr("src", "palmtree_summary.html"); }) + $("#jacaranda").click(function() { + $("#i_content").attr("src", "jacaranda_content.html"); + $("#i_summary").attr("src", "jacaranda_summary.html"); + }) /* This will not be merged ! */ diff --git a/lesson_07/jacaranda_content.html b/lesson_07/jacaranda_content.html new file mode 100644 index 0000000..b356f09 --- /dev/null +++ b/lesson_07/jacaranda_content.html @@ -0,0 +1,21 @@ + + +

Jacaranda

+ +

The species are shrubs to large trees ranging in size from 20 to 30 m (66 to 98 ft) tall. The leaves are bipinnate in most species, pinnate or simple in a few species. The flowers are produced in conspicuous large panicles, each flower with a five-lobed blue to purple-blue corolla; a few species have white flowers. The fruit is an oblong to oval flattened capsule containing numerous slender seeds. The genus differs from other genera in the Bignoniaceae in having a staminode that is longer than the stamens, tricolpate pollen, and a chromosome number of 18.

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

Jacaranda

+ +

Tree or shrub

+ +

Family: Bignoniaceae. +

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

Palm Trees

+ +

The Arecaceae is a family of perennial, flowering plants in the monocot order Arecales. Their growth form can be climbers, shrubs, tree-like and stemless plants, all commonly known as palms. Those having a tree-like form are called palm trees.

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

Palm Tree

+ +

Tree or shrub

+ +

Family: Arecaceae. + Pictured above: Phoenix dactylifera (date palm) +

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

Rosewoods

+ +

Rosewood is any of a number of richly hued hardwoods, often brownish with darker veining, but found in other colours. It is hard, tough, strong, and dense. True rosewoods come from trees of the genus Dalbergia, but other woods are often called rosewood. Rosewood takes a high polish and is used for luxury furniture-making, flooring, musical instruments, and turnery.

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

Rosewoods

+ +

Tree or shrub

+ +

Family: Dalbergia. +

\ No newline at end of file diff --git a/lesson_08/chocolate.html b/lesson_08/chocolate.html index 391a643..22c3d86 100644 --- a/lesson_08/chocolate.html +++ b/lesson_08/chocolate.html @@ -7,14 +7,11 @@ - -

Chocolate

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

    Chocolate

  • Ghana
- + diff --git a/lesson_08/coconut.html b/lesson_08/coconut.html index acfc28e..c41c431 100644 --- a/lesson_08/coconut.html +++ b/lesson_08/coconut.html @@ -25,9 +25,11 @@

Coconut

- + + + - +