Pika

lesson_06/team.html

@@ -31,14 +31,17 @@ <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 -->
+            <p>Tony Lin</p>
+          </div>
 
+
+          <div class="member">
+            <p>Danny S</p>
           </div>
 
           <div class="member">
-            <!--  student 02 -->
+            <p>"(╯°□°）╯︵ ┻━┻"</p>
 
           </div>
 
@@ -73,4 +76,4 @@ <h1 class="header1 header">
       </div>
     </div>
   </body>
-</html>
+</html>

lesson_07/DeadBush_content.html

@@ -0,0 +1,24 @@
+<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>Dead Bush</h3>
+
+    <p>a Dead Bush (Twig) is a genus of deciduous trees in the family youdidnottakecareofitproperly, native everywhere. Recent classifications recognize that they are all dead. </p>
+
+
+

lesson_07/DeadBush_summary.html

@@ -0,0 +1,35 @@
+<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>Dead Bush</h3>
+
+    <p id="type"> Tree </p>
+    <img src="img/dead bush.jpg" style="width: 200px;">
+
+    <p>Family: youdidnottakecareofitproperly</p>
+
+

lesson_07/Tree_content.html

@@ -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>Tree</h3>
+
+    <p> just any Tree </p>
+
+
+
+

lesson_07/Tree_summary.html

@@ -0,0 +1,34 @@
+<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>Tree</h3>
+
+    <p id="type"> Tree </p>
+    <img src="img/apple.jpg" style="width: 200px;">
+
+    <p>Family: Trees</p>
+

lesson_07/index.html

@@ -24,6 +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="Dead">Dead</button></p>
+            <p><button id="Tree">Tree</button></p>
 
         </div>
         <div class="content">
@@ -33,7 +35,7 @@ <h3>Index</h3>
             </iframe>
         </div>
         <div class="summary">
-            <iframe  id="i_summary" src="oak_summary.html">
+            <iframe  id="i_summary"  src="oak_summary.html">
             </iframe>
         </div>
 
@@ -51,8 +53,16 @@ <h3>Index</h3>
         })
         $("#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 !  */
 

lesson_08/banana.html

@@ -31,8 +31,8 @@ <h1 class="title">Banana</h1>
                 <l>India</li>
                 <li>China</li>
                 <li>Phillipines</li>
-                <li>Ecuador</p>
-                <li>Indonesia</l>
+                <li>Ecuador</li>
+                <li>Indonesia</li>
             </ul>        
 
             <!-- --------------------------------------------- -->

lesson_08/chocolate.html

@@ -11,7 +11,7 @@
     <!-- I think there is something wrong in this part -->
     <div clas="container">
         <h1 class="title">Chocolate</h1>
-        <diiv class="description">>>
+        <diiv class="description">
             Our chocolate ice cream is really good, made with real cacao !
     <!-- --------------------------------------------- -->
 

lesson_08/coconut.html

@@ -25,7 +25,7 @@ <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 hrf="index.html"><button type="button">Back</button></a>
 
         </dif>
     </div>

lesson_08/grapefruit.html

@@ -18,15 +18,16 @@ <h1 class="title">Grapefruit</h1>
 
             <ul>
                 <li>China</ul>
-                <lii>Vietnam</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>
 

lesson_08/mango.html

@@ -11,7 +11,7 @@
     <!-- I think there is something wrong in this part --> 
 
     <div class="container">
-        <h1 class="title"Mango</h1>
+        <h1 class="title">Mango</h1>
         <dif cluss="description">
             Our mango ice cream is very fresh tasting and has a nice, appealing orange color.
             We use fresh mangos for our mango ice cream.

lesson_08/strawberry.html

@@ -17,19 +17,19 @@ <h1 class="title">Strawberry</h1>
 
             <!-- I think there is something wrong in this part --> 
 
-            <ull>
+            <ul>
                 <li>China</li>
                 <li>United States</li>
-                <li>Mexico</lii>
+                <li>Mexico</li>
                 <li>Egypt</li>
-                <li Turkey</li>
+                <li>Turkey</li>
             </ul>
 
             <!-- ------------------------------------------ -----> 
 
-            <img src="">
+            <img src="img/strawberry.jpg">
 
-            <a href="index.html"><button type="button">Back</button></a>
+            <a href="index.html"><button type="button">Return</button></a>
 
         </div>
     </div>