10-08 updates

USTCSoftware2019 · Oct 8, 2019 · dc34e0e · dc34e0e
1 parent 10985cc
commit dc34e0e
Show file tree

Hide file tree

Showing 38 changed files with 145 additions and 105 deletions.
diff --git a/File/Red Appearance.jpg → File/T--USTC-Software--Red Appearance.jpg b/File/Red Appearance.jpg → File/T--USTC-Software--Red Appearance.jpg
diff --git a/File/Reticular-formation.jpg → ...T--USTC-Software--Reticular-formation.jpg b/File/Reticular-formation.jpg → ...T--USTC-Software--Reticular-formation.jpg
diff --git a/File/Slide_down_white.svg → File/T--USTC-Software--Slide_down_white.svg b/File/Slide_down_white.svg → File/T--USTC-Software--Slide_down_white.svg
diff --git a/File/WEB.svg → File/T--USTC-Software--WEB.svg b/File/WEB.svg → File/T--USTC-Software--WEB.svg
diff --git a/File/arrow down.svg → File/T--USTC-Software--arrow down.svg b/File/arrow down.svg → File/T--USTC-Software--arrow down.svg
diff --git a/File/avatar.jpg → File/T--USTC-Software--avatar.jpg b/File/avatar.jpg → File/T--USTC-Software--avatar.jpg
diff --git a/File/clock.gif → File/T--USTC-Software--clock.gif b/File/clock.gif → File/T--USTC-Software--clock.gif
diff --git a/File/desktop.jpg → File/T--USTC-Software--desktop.jpg b/File/desktop.jpg → File/T--USTC-Software--desktop.jpg
diff --git a/File/lhr.svg → File/T--USTC-Software--lhr.svg b/File/lhr.svg → File/T--USTC-Software--lhr.svg
diff --git a/File/light.png → File/T--USTC-Software--light.png b/File/light.png → File/T--USTC-Software--light.png
diff --git a/File/logo.jpg → File/T--USTC-Software--logo.jpg b/File/logo.jpg → File/T--USTC-Software--logo.jpg
diff --git a/File/logo_w.jpg → File/T--USTC-Software--logo_w.jpg b/File/logo_w.jpg → File/T--USTC-Software--logo_w.jpg
diff --git a/File/logo_w_min.jpg → File/T--USTC-Software--logo_w_min.jpg b/File/logo_w_min.jpg → File/T--USTC-Software--logo_w_min.jpg
diff --git a/File/menu.svg → File/T--USTC-Software--menu.svg b/File/menu.svg → File/T--USTC-Software--menu.svg
diff --git a/File/scroll.png → File/T--USTC-Software--scroll.png b/File/scroll.png → File/T--USTC-Software--scroll.png
diff --git a/File/slide_down.svg → File/T--USTC-Software--slide_down.svg b/File/slide_down.svg → File/T--USTC-Software--slide_down.svg
diff --git a/File/team members.jpg → File/T--USTC-Software--team members.jpg b/File/team members.jpg → File/T--USTC-Software--team members.jpg
diff --git a/File/web2.svg → File/T--USTC-Software--web2.svg b/File/web2.svg → File/T--USTC-Software--web2.svg
diff --git a/File/bookmark.svg b/File/bookmark.svg
diff --git a/File/底_1.gif b/File/底_1.gif
diff --git a/File/底_8.gif b/File/底_8.gif
diff --git a/Team/HUMAN PRACTICE/Human_Practices.html b/Team/HUMAN PRACTICE/Human_Practices.html
@@ -27,7 +27,7 @@ <h2 class="text-center">Human Practices</h2>
       <div class="mb-5">
         <h3>I. Title</h3>
         <div class="ml-3 mr-3">
-            <img src="../../File/Reticular-formation.jpg" style="width:480px; height:300px; border: 10px solid #eee; border-radius: 5px; float: right;" class="img-fluid ml-3">
+            <img src="../../File/T--USTC-Software--Reticular-formation.jpg" style="width:480px; height:300px; border: 10px solid #eee; border-radius: 5px; float: right;" class="img-fluid ml-3">
             At iGEM we believe societal considerations should be upfront and integrated throughout the design and execution of synthetic biology projects. 
             “Human Practices” refers to iGEM teams’ efforts to actively consider how the world affects their work and the work affects the world. 
             Through your Human Practices activities, your team should demonstrate how you have thought carefully and creatively about whether your project is 
@@ -43,7 +43,7 @@ <h3>I. Title</h3>
       <div class="mb-5">
         <h3>II. Title</h3>
         <div class="ml-3 mr-3">
-          <img src="../../File/Reticular-formation.jpg" style="width:480px; height:300px; border: 10px solid #eee; border-radius: 5px; float: left;" class="img-fluid mr-3">
+          <img src="../../File/T--USTC-Software--Reticular-formation.jpg" style="width:480px; height:300px; border: 10px solid #eee; border-radius: 5px; float: left;" class="img-fluid mr-3">
           At iGEM we believe societal considerations should be upfront and integrated throughout the design and execution of synthetic biology projects. 
           “Human Practices” refers to iGEM teams’ efforts to actively consider how the world affects their work and the work affects the world. 
           Through your Human Practices activities, your team should demonstrate how you have thought carefully and creatively about whether your project is 
@@ -59,7 +59,7 @@ <h3>II. Title</h3>
       <div class="mb-5">
         <h3>III. Title</h3>
         <div class="ml-3 mr-3">
-          <img src="../../File/Reticular-formation.jpg" style="width:480px; height:300px; border: 10px solid #eee; border-radius: 5px; float: right;" class="img-fluid ml-3">
+          <img src="../../File/T--USTC-Software--Reticular-formation.jpg" style="width:480px; height:300px; border: 10px solid #eee; border-radius: 5px; float: right;" class="img-fluid ml-3">
           At iGEM we believe societal considerations should be upfront and integrated throughout the design and execution of synthetic biology projects. 
           “Human Practices” refers to iGEM teams’ efforts to actively consider how the world affects their work and the work affects the world. 
           Through your Human Practices activities, your team should demonstrate how you have thought carefully and creatively about whether your project is 

diff --git a/Team/HUMAN PRACTICE/Public_Engagement.html b/Team/HUMAN PRACTICE/Public_Engagement.html
@@ -23,15 +23,15 @@ <h3>I. Title</h3>
             Innovative educational tools and public engagement activities have the ability to discuss the science behind synthetic biology, 
             spark new scientific curiosity and establish a public dialogue about synthetic biology from voices and views outside the lab.
             <div class="mb-5 mt-5 row">
-              <img src="../../File/Reticular-formation.jpg" style="width:45%; float: left; border: 10px solid #eee; border-radius: 5px; margin-right: 5%;" class="img-fluid">
-              <img src="../../File/Reticular-formation.jpg" style="width:45%; float: right; border: 10px solid #eee; border-radius: 5px; margin-right: 5%;" class="img-fluid">
+              <img src="../../File/T--USTC-Software--Reticular-formation.jpg" style="width:45%; float: left; border: 10px solid #eee; border-radius: 5px; margin-right: 5%;" class="img-fluid">
+              <img src="../../File/T--USTC-Software--Reticular-formation.jpg" style="width:45%; float: right; border: 10px solid #eee; border-radius: 5px; margin-right: 5%;" class="img-fluid">
             </div>
             At iGEM we believe societal considerations should be upfront and integrated throughout the design and execution of synthetic biology projects. 
             “Human Practices” refers to iGEM teams’ efforts to actively consider how the world affects their work and the work affects the world. 
             Through your Human Practices activities, your team should demonstrate how you have thought carefully and creatively about whether your project is 
             responsible and good for the world. We invite you to explore issues relating (but not limited) to the ethics, safety, security, and sustainability 
             of your project, and to show how this exploration feeds back into your project purpose, design and execution.
-            <img src="../../File/Reticular-formation.jpg" style="width:480px; height:300px; border: 10px solid #eee; border-radius: 5px; float: right;" class="img-fluid ml-3">
+            <img src="../../File/T--USTC-Software--Reticular-formation.jpg" style="width:480px; height:300px; border: 10px solid #eee; border-radius: 5px; float: right;" class="img-fluid ml-3">
             At iGEM we believe societal considerations should be upfront and integrated throughout the design and execution of synthetic biology projects. 
             “Human Practices” refers to iGEM teams’ efforts to actively consider how the world affects their work and the work affects the world. 
             Through your Human Practices activities, your team should demonstrate how you have thought carefully and creatively about whether your project is 
@@ -42,7 +42,7 @@ <h3>I. Title</h3>
       <div class="mb-5">
         <h3>II. Title</h3>
         <div class="ml-3 mr-3">
-          <img src="../../File/Reticular-formation.jpg" style="width:480px; height:300px; border: 10px solid #eee; border-radius: 5px; float: left;" class="img-fluid mr-3">
+          <img src="../../File/T--USTC-Software--Reticular-formation.jpg" style="width:480px; height:300px; border: 10px solid #eee; border-radius: 5px; float: left;" class="img-fluid mr-3">
           At iGEM we believe societal considerations should be upfront and integrated throughout the design and execution of synthetic biology projects. 
           “Human Practices” refers to iGEM teams’ efforts to actively consider how the world affects their work and the work affects the world. 
           Through your Human Practices activities, your team should demonstrate how you have thought carefully and creatively about whether your project is 
@@ -58,7 +58,7 @@ <h3>II. Title</h3>
       <div class="mb-5">
         <h3>III. Title</h3>
         <div class="ml-3 mr-3">
-          <img src="../../File/Reticular-formation.jpg" style="width:480px; height:300px; border: 10px solid #eee; border-radius: 5px; float: right;" class="img-fluid ml-3">
+          <img src="../../File/T--USTC-Software--Reticular-formation.jpg" style="width:480px; height:300px; border: 10px solid #eee; border-radius: 5px; float: right;" class="img-fluid ml-3">
           At iGEM we believe societal considerations should be upfront and integrated throughout the design and execution of synthetic biology projects. 
           “Human Practices” refers to iGEM teams’ efforts to actively consider how the world affects their work and the work affects the world. 
           Through your Human Practices activities, your team should demonstrate how you have thought carefully and creatively about whether your project is 

diff --git a/Team/PROJECT/Notebook.html b/Team/PROJECT/Notebook.html
@@ -14,8 +14,8 @@
 <script type="text/javascript" src="https://2019.igem.org/Template:USTC-Software/js/popper?action=raw&ctype=text/javascript"></script>
 <script type="text/javascript" src="https://2019.igem.org/Template:USTC-Software/js/bootstrap?action=raw&ctype=text/javascript"></script>
 
-<link rel="stylesheet" href="../../Template/css/jquery.eeyellow.Timeline.css">
-<script src="../../Template/js/jquery.eeyellow.Timeline.js"></script>
+<link rel="stylesheet" href="../../Template/css/Timeline.css">
+<script src="../../Template/js/Timeline.js"></script>
 <div class="container">
   <div class="card">
     <div class="card-body">
@@ -36,7 +36,7 @@ <h2 class="text-center">Notebook</h2>
                       <div class="events-body">
                         <div class="row">
                           <div class="float-left p-3">
-                            <img class="events-object img-responsive img-rounded m-auto" src="../../File/avatar.jpg"  style="height:200px;"/>
+                            <img class="events-object img-responsive img-rounded m-auto" src="../../File/T--USTC-Software--avatar.jpg" style="height:200px;"/>
                           </div>
                           <div class="events-desc">
                             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
@@ -54,7 +54,7 @@ <h2 class="text-center">Notebook</h2>
                       <div class="events-body">
                         <div class="row">
                           <div class="float-left p-3">
-                            <img class="events-object img-responsive img-rounded" src="../../File/avatar.jpg"  style="height:200px;"/>
+                            <img class="events-object img-responsive img-rounded" src="../../File/T--USTC-Software--avatar.jpg" style="height:200px;"/>
                           </div>
                           <div class="events-desc">
                             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
@@ -74,7 +74,7 @@ <h2 class="text-center">Notebook</h2>
                       <div class="events-body">
                         <div class="row">
                           <div class="d-flex justify-content-center align-items-center">
-                            <img class="events-object img-responsive img-rounded" src="../../File/desktop.jpg" style="height:300px;"/>
+                            <img class="events-object img-responsive img-rounded" src="../../File/T--USTC-Software--desktop.jpg" style="height:300px;"/>
                           </div>
                           <div class="events-desc">
                             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.