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/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/team.html b/lesson_06/team.html index 4bb4728..6ad4431 100644 --- a/lesson_06/team.html +++ b/lesson_06/team.html @@ -31,15 +31,16 @@ <h1 class="header1 header"> <p><img class="member-pic" src="img/Alex_001.png"></p> <p>John Mastercoder</p> </div> - <div class="member"> - <!-- student 01 --> + <!-- Instructor --> + + <p> Lev F</p> + </div> <div class="member"> - <!-- student 02 --> - + <p>Eshaan Katar</p> </div> <div class="member"> diff --git a/lesson_07/index.html b/lesson_07/index.html index 7eb0fd4..d34a590 100644 --- a/lesson_07/index.html +++ b/lesson_07/index.html @@ -22,8 +22,10 @@ <h1>The Tree Encyclopedia</h1> <div class="index"> <h3>Index</h3> - <p><button id="oak">Oak</button></p> + <p><button id="oak">ak</button></p> <p><button id="beech">Beech</button></p> + <p><button id="rosewood">Rosewood</button></p> + <p><button id="Palmtree">Palmtree</button></p> </div> <div class="content"> @@ -51,7 +53,15 @@ <h3>Index</h3> }) $("#beech").click(function(){ + $("#i_content").attr("src","beech_content.html"); + $("#i_summary").attr("src","beech_summary.html"); + + + }) + $("#rose").click(function(){ + $("#i_content").attr("src","rosewood_content.html"); + $("#i_summary").attr("src","rosewood.html"); }) /* This will not be merged ! */ diff --git a/lesson_07/palmtree_content.html b/lesson_07/palmtree_content.html new file mode 100644 index 0000000..6728ab8 --- /dev/null +++ b/lesson_07/palmtree_content.html @@ -0,0 +1,21 @@ +<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>Oak</h3> + + <p>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.</p> \ 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..4a4936e --- /dev/null +++ b/lesson_07/palmtree_summary.html @@ -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>Palm Tree</h3> + + <p id="type"> Tree or shrub </p> + <img src="img/oak.jpg" style="width: 200px;"> + <p>Family: genus Quercus of the beech family, Fagaceae. + </p> \ 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..fbef8d1 --- /dev/null +++ b/lesson_07/rosewood_content.html @@ -0,0 +1,23 @@ +<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>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>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> \ 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..b27e39f --- /dev/null +++ b/lesson_07/rosewood_summary.html @@ -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>Oak</h3> + + <p id="type"> Tree or shrub </p> + <img src="img/rosewood.jpg" style="width: 200px;"> + <p>Family: genus Quercus of the beech family, Fagaceae. + </p> \ 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 @@ <link rel="stylesheet" href="style.css"> </head> <body> - - <!-- I think there is something wrong in this part --> <div clas="container"> <h1 class="title">Chocolate</h1> - <diiv class="description">>> + <div class="description"> Our chocolate ice cream is really good, made with real cacao ! - <!-- --------------------------------------------- --> - + </div> Here are some of the countries where cacao is harvested: <ul> @@ -25,7 +22,7 @@ <h1 class="title">Chocolate</h1> <li>Ghana</li> </ul> - <img src=""> + <img src="img/chocolate.jpg"> <a href="index.html"><button type="button">Back</button></a> 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 @@ <h1 class="title">Coconut</h1> <!-- I think there is something wrong in this part --> - <a hrf="index.html"><button type="button">Back</button></aa> + <a href="index.html"> + <button type="button">Back</button> + </a> - </dif> + </div> </div> <!-- --------------------------------------------- -->