Difference between revisions of "Team:UCSC"

Latest revision as of 02:28, 19 September 2015

In collaboration with:

@@ Line 11: / Line 11: @@
 body{padding-bottom: 70px;}
+.navbar-nav > li{
+  padding-top: 5px;
+  padding-left:15px;
+  padding-right:20px;
+}
+.navbar .navbar-nav {
+    display: inline-block;
+    float: none;
+}
+.navbar .navbar-collapse {
+    text-align: center;
+}
 .bernick a:hover { color: #CCAC00;}
@@ Line 102: / Line 116: @@
 @media screen and (max-width: 1280px) {
+.gear {width: 10%; height: 10%;}
 #salt {width: 100%}
@@ Line 136: / Line 152: @@
 #foot {width: 100%}
+.gear {width: 10%; height: 10%;}
 }
@@ Line 154: / Line 170: @@
 #foot {width: 100%}
-.gear {width: 25%;}
+.gear {width: 10%; height: 10%;}
 }
@@ Line 173: / Line 189: @@
 #foot {width: 100%}
+.gear {width: 10%; height: 10%;}
 }
@@ Line 199: / Line 216: @@
          <li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Team <span class="caret"></span></a>
            <ul class="dropdown-menu">
-             <li><a href="https://2015.igem.org/Team:UCSC/Captains">The Captains</a></li>
+             <li><a href="https://2015.igem.org/Team:UCSC/Team">Meet the Team</a></li>
              <li><a href="https://2015.igem.org/Team:UCSC/Breakdown">Breakdown</a></li>
              <li><a href="https://2015.igem.org/Team:UCSC/Fermentation">Fermentation</a></li>
              <li><a href="https://2015.igem.org/Team:UCSC/Field">Field</a></li>
+            <li><a href="https://2015.igem.org/Team:UCSC/Attributions">Attributions</a></li>
+          </ul>
+        </li>
+        <li><a href="https://2015.igem.org/Team:UCSC/Description">Project</a></li>
+          <li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Human Practices<span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="https://2015.igem.org/Team:UCSC/Outreach">Outreach</a></li>
+            <li><a href="https://2015.igem.org/Team:UCSC/Practices">Bioethics</a></li>
            </ul>
          </li>
-        <li><a href="https://2015.igem.org/Team:UCSC/Project">Project</a></li>
-        <li><a href="https://2015.igem.org/Team:UCSC/Outreach">Outreach</a></li>
          <li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Notebook<span class="caret"></span></a>
            <ul class="dropdown-menu">
@@ Line 214: / Line 237: @@
          </li>
          <li><a href="https://2015.igem.org/Team:UCSC/Safety">Safety</a></li>
-        <li><a href="https://2015.igem.org/Team:UCSC/Parts">Parts</a></li>
+<li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Achievements<span class="caret"></span></a>
-        <li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#">F.O.C.U.S<span class="caret"></span></a>
            <ul class="dropdown-menu">
-             <li><a href="https://2015.igem.org/Team:UCSC/FOCUS_Works">How it works</a></li>
+             <li><a href="https://2015.igem.org/Team:UCSC/Parts">Parts</a></li>
-             <li><a href="https://2015.igem.org/Team:UCSC/FOCUS_Devs">Developers</a></li>
+             <li><a href="https://2015.igem.org/Team:UCSC/Medal_Fulfillment">Medal Fulfillment</a></li>
+             <li><a href="https://2015.igem.org/Team:UCSC/Results">Results</a></li>
+</ul>
+            <li><a href="https://2015.igem.org/Team:UCSC/Software">Software</a></li>
        </ul>
      </div>
@@ Line 227: / Line 253: @@
 <!--First Block -->
-<div id="salt">
-<img src="https://static.igem.org/mediawiki/2015/5/50/Pheader.jpg" />
-</div>
-<div id="our_content" align="center">
-<img src="https://static.igem.org/mediawiki/2015/7/73/Ucsclogo.png" width="95%" height="95%" />
-<p>
+<div id="our_content" align="center">
+<img src="https://static.igem.org/mediawiki/2015/7/73/Ucsclogo.png" width="99%" height="99%" />
+<img src="https://static.igem.org/mediawiki/2015/3/3f/Ucsc_slogan.png" />
+<p style="font-size: 12px;">
+In collaboration with:
+<br />
+<img src="https://static.igem.org/mediawiki/2015/c/cd/IGEM_WikiFlicks_logo_white.png" style="height: 20%; width: 20%"/>
 </p>
@@ Line 253: / Line 279: @@
 <table class="center">
 <tr>
-     <td><a href="#"><img src="https://static.igem.org/mediawiki/2015/3/3c/Ucsc_sustainability.jpg" width="350" height="200"></a></td>
+     <td><a href="https://2015.igem.org/Team:UCSC/Description"><img src="https://static.igem.org/mediawiki/2015/3/3c/Ucsc_sustainability.jpg" width="350" height="200"></a></td>
      <td><img src="https://static.igem.org/mediawiki/2015/4/41/Sammythumbsup.png" width="350" height="300"></a></td>
      <td><a href="https://2015.igem.org/Team:UCSC/Outreach"><img src="https://static.igem.org/mediawiki/2015/3/32/Ucsc_outreach.jpg" width="350" height="200"></a></td>
@@ Line 268: / Line 294: @@
 </div>
+  <!--Footer-->
-    <!--Footer-->
 <div id="foot" class="center foot">
-<img src="https://static.igem.org/mediawiki/2015/8/80/Cellulose_Footer.png" width="25%" /><img class="gear" src="https://static.igem.org/mediawiki/2015/1/11/Ucsc_gear.png" alt="">&nbsp;&nbsp; <a href="https://2015.igem.org/Team:UCSC">Home</a> | <a href="https://2015.igem.org/Team:UCSC/Team">Teams</a> | <a href="https://2015.igem.org/Team:UCSC/Project">Project</a> | <a href="https://2015.igem.org/Team:UCSC/Outreach">Outreach</a> | <a href="https://2015.igem.org/Team:UCSC/Notebook">Notebook</a> | <a href="https://2015.igem.org/Team:UCSC/Safety">Safety</a> | <a href="https://2015.igem.org/Team:UCSC/Parts">Parts</a> | <a href="https://2015.igem.org/Team:UCSC/Software">F.O.C.U.S</a> &nbsp;&nbsp; <img class="gear" src="https://static.igem.org/mediawiki/2015/1/11/Ucsc_gear.png" alt="">
+<img src="https://static.igem.org/mediawiki/2015/8/80/Cellulose_Footer.png" width="25%" /><img class="gear" src="https://static.igem.org/mediawiki/2015/1/11/Ucsc_gear.png" alt="">&nbsp;&nbsp; <a href="https://2015.igem.org/Team:UCSC">Home</a> | <a href="https://2015.igem.org/Team:UCSC/Team">Teams</a> | <a href="https://2015.igem.org/Team:UCSC/Description">Project</a> | <a href="https://2015.igem.org/Team:UCSC/Practices">Human Practices</a> | <a href="https://2015.igem.org/Team:UCSC/Logs">Notebook</a> | <a href="https://2015.igem.org/Team:UCSC/Safety">Safety</a> | <a href="https://2015.igem.org/Team:UCSC/Parts">Parts</a> | <a href="https://2015.igem.org/Team:UCSC/Software">F.O.C.U.S</a> &nbsp;&nbsp; <img class="gear" src="https://static.igem.org/mediawiki/2015/1/11/Ucsc_gear.png" alt="">
 <img src="https://static.igem.org/mediawiki/2015/4/4c/Fuel_Footer.png"  width="25%"/>
 <ul id="menu">
-<li><img src="https://static.igem.org/mediawiki/2015/a/a9/Fns4kg.png" style="width: 148px; height:148px;" /></li>
+<li><img src="https://static.igem.org/mediawiki/2015/a/a9/Fns4kg.png" style="width: 88px; height:88px;" /></li>
-<li><img src="https://static.igem.org/mediawiki/2015/0/03/Vwr.png" /></li>
-<li><img src="https://static.igem.org/mediawiki/2015/6/62/Ucsc.png" style="width: 348px; height: 98px;" /></li>
+<li><img src="https://static.igem.org/mediawiki/2015/0/03/Vwr.png" style="width: 241px; height: 50px "/></li>
-<li><img src="https://static.igem.org/mediawiki/2015/b/b6/Geneious_logo.png" style="width: 348px; height: 148px; " /></li>
+<li><img src="https://static.igem.org/mediawiki/2015/6/62/Ucsc.png" style="width: 288px; height: 68px;" /></li>
-<li><img src="https://static.igem.org/mediawiki/2015/3/34/Idt.jpg" style="width: 148px; height: 148px;" /></li>
+<li><img src="https://static.igem.org/mediawiki/2015/b/b6/Geneious_logo.png" style="width: 288px; height: 88px; " /></li>
+<li><img src="https://static.igem.org/mediawiki/2015/3/34/Idt.jpg" style="width: 88px; height: 88px;" /></li>
 </ul>