Difference between revisions of "Template:RHIT"

Revision as of 16:01, 9 July 2018 (view source)

Patekm (Talk | contribs)

← Older edit

Latest revision as of 00:10, 16 October 2018 (view source)

Patekm (Talk | contribs)

(157 intermediate revisions by 2 users not shown)

Line 15:

/* Change Background color*/

body {

−

background-color: #~~E0FDFC~~;

+

background-color: #e0fdfc;

+

}

Line 56:

Line 57:

/* Change Background color*/

body {

−

background-~~color~~: ~~#8a9b9a~~;

+

background: url("https://static.igem.org/mediawiki/2018/9/97/T--RHIT--ROCKS.jpg");

+

background-size: 100%;

+

background-repeat: no-repeat;

+

background-attachment: fixed;

}

/* Creates a container that will wrap all of the content inside your wiki pages. */

#mainContainer {

−

width:113.6%;

+

width:113.75%;

overflow:hidden;

−

padding:~~auto~~;

+

padding-top:0px;

position:absolute;

top:350px;

−

padding-bottom: ~~100px~~;

+

padding-bottom: 200px;

text-align:left;

background-color:#E0FDFC;

Line 73:

Line 77:

#contentContainer {

−

~~position:absolute~~

+

padding-top:5%;

padding-left:2%;

padding-right:3%;

−

padding-bottom: ~~100px~~;

+

padding-bottom: 200px;

width: 110%;

−

float:left

+

float:left;

background-color:#E0FDFC;

font-family: "Arial", Helvetica, sans-serif;

Line 109:

Line 113:

font-family: "Arial Black", Gadget, sans-serif;

padding: 5px 0px;

−

font-size: ~~200~~%

+

font-size: 150%

}

Line 116:

Line 120:

border-bottom:0px;

font-family: "Elephant", Gadget, sans-serif;

−

padding: ~~5px~~ 0px;

+

padding: 10px 0px;

−

font-size: ~~230~~%

+

font-size: 200%

}

#contentContainer h5

Line 124:

Line 128:

color: #51A8A5;

font-family: "Elephant", Gadget, sans-serif;

−

padding: ~~5px~~ 0px;

+

padding: 10px 0px;

font-size: 200%

}

Line 130:

Line 134:

{

border-bottom:0px;

−

font-family: "~~Elephant~~", Gadget, sans-serif;

+

font-family: "Niagra Solid", Gadget, sans-serif;

padding: 5px 0px;

font-size: 130%

Line 139:

Line 143:

/*Style of the links - links are different inside the menu */

−

~~#contentContainer~~ a {

+

a {

−

color: #~~034FEC~~;

+

color: #078c96;

font-weight: bold;

−

~~text-decoration: underline;~~

+

text-decoration-color:#078c96;

−

text-decoration-color:#~~034FEC~~;

+

transition: all 0.4s ease;

-webkit-transition: all 0.4s ease;

Line 152:

Line 155:

/* Styling links on hover- links are different inside the menu */

−

~~#contentContainer~~ a:hover {

+

a:hover {

−

color: #~~f8b732~~;

+

color: #3bd3a8;

text-decoration:none;

}

Line 159:

Line 162:

/*Change the styling of tables */

#contentContainer table {

−

border: 1px solid #~~928b8b~~;

+

border: 1px solid #000000;

border-collapse: collapse;

font-size: 130%;

Line 167:

Line 170:

/*Change the styling of table cells*/

#contentContainer td {

−

border: 1px solid #~~c4baba~~;

+

border: 1px solid #000000;

−

border-collapse: collapse;

+

border-collapse: collapse;

−

font-size: ~~105~~%;

+

background-color: #c8ff9e;

−

padding: 10px;

+

font-size: 100%;

−

~~vertical~~-~~align~~: text-~~top~~;

+

padding: 10px;

+

line-height:30px;

+

text-align:center;

}

/*Change the styling of table headers */

#contentContainer th {

−

background-color:#~~c4baba~~;

+

background-color:#7ed7db;

−

border: 1px solid #~~928b8b~~;

+

border: 1px solid #000000;

border-collapse: collapse;

−

font-size: ~~110~~%;

+

font-size: 100%;

−

padding: 10px;

+

padding: 10px 20px;

−

~~vertical~~-align: ~~text-top~~;

+

text-align: center;

}

/*links*/

−

a:link { color:#~~efefef~~; background-color:transparent; text-decoration:none}

+

a:link { color:#078c96; background-color:transparent; text-decoration:none}

−

a:visited { color:#~~efefef~~; background-color:transparent; text-decoration:none}

+

a:visited { color:#078c96; background-color:transparent; text-decoration:none}

−

a:hover { color:#~~64afb3~~; background-color:transparent; text-decoration:none}

+

a:hover { color:#3bd3a8; background-color:transparent; text-decoration:none}

−

a:active { color:#~~efefef~~; background-color:transparent; text-decoration:none}

+

a:active { color:#078c96; background-color:transparent; text-decoration:none}

Line 242:

Line 247:

position: absolute;

top: 80%;

−

left: 50%;

+

left:50%;

−

~~vertical~~-align: ~~middle~~;

+

text-align: center;

transform: translate(-50%, -50%);

-ms-transform: translate(-50%, -50%);

−

~~text-align: center;~~

}

Line 283:

Line 287:

}

−

+

.center {

+

display: block;

+

margin-left: auto;

+

margin-right: auto;

+

width: 45%;

+

}

/**************************************************************************************************************************************************************************************************/

Line 352:

Line 361:

/* 100% */

−

#mainContainer .column.full_size { width:80%; }

+

#mainContainer .column.full_size { width:83%; }

/* 66% */

Line 414:

Line 423:

/*buttons for the menu*/

+

.pebble {

+

position:absolute;

+

left:166px;

+

top:30px;

+

z-index:0.5;

+

width:75%;

+

}

+

.topscroll {

+

position:absolute;

+

right:20px;

+

bottom:200px;

+

width:13%;

+

}

.home {

Line 425:

Line 450:

left: 138px;

top: 110px;

+

cursor:pointer;

}

Line 463:

Line 489:

top: 190px;

left: 405px;

+

cursor:pointer;

}

−

~~.partsSubOve{~~

−

~~position:absolute;~~

−

~~top:262px;~~

−

~~left:424px;~~

−

~~display: none;~~

−

~~z-index:1;~~

−

}

−

~~.partsSubBas{~~

−

~~position:absolute;~~

−

~~top:285px;~~

−

~~left:415px;~~

−

~~display: none;~~

−

~~z-index:1;~~

−

}

−

~~.partsSubComp{~~

−

~~position:absolute;~~

−

~~top:322px;~~

−

~~left:390px;~~

−

~~display: none;~~

−

~~z-index:1;~~

−

}

−

~~.partsSubColc{~~

−

~~position:absolute;~~

−

~~top:368px;~~

−

~~left:375px;~~

−

~~display: none;~~

−

~~z-index:1;~~

−

}

Line 506:

Line 501:

.model{

position:absolute;

−

top:~~118px~~;

+

top:127px;

−

left:~~770px~~;

+

left:760px;

+

cursor:pointer;

}

.modelSubBac{

Line 536:

Line 532:

position:absolute;

top:320px;

+

left:800px;

+

display: none;

+

z-index:2;

+

}

+

.modelSubOve{

+

position:absolute;

+

top:364px;

left:800px;

display: none;

z-index:1;

}

−

.judge{

Line 552:

Line 554:

top:160px;

left:635px;

+

cursor:pointer;

}

Line 575:

Line 578:

color:#000000;

}

−

+

.green {

+

color:#51A8A5;

+

}

Line 638:

Line 643:

function bottleone() {

$("#bottle1").css({left:30,top:400},500);

−

$("#bottle1").show().animate({left:50,top:250},500, 'linear').animate({left:80,top:220},500, 'linear').animate({left:100,top:240},500, 'linear').animate({left:140,top:200},500, 'linear').animate({left:195,top:227},500, 'linear').animate({left:230,top:205},500, 'linear').animate({left:250,top:229},500, 'linear').animate({left:260,top:250},500, 'linear').animate({left:238,top:260},500, 'linear').animate({left:250,top:250},500, 'linear').animate({left:300,top:250},500, 'linear').animate({left:350,top:235},500, 'linear').animate({left:400,top:230},500, 'linear').animate({left:450,top:240},500, 'linear').animate({left:520,top:230},500, 'linear').animate({left:580,top:250},500, 'linear').animate({left:560,top:235},500, 'linear').animate({left:600,top:225},500, 'linear').animate({left:630,top:220},500, 'linear').animate({left:650,top:230},500, 'linear').animate({left:690,top:240},500, 'linear').animate({left:730,top:240},500, 'linear').animate({left:780,top:260},500, 'linear').animate({left:850,top:250},500, 'linear').animate({left:820,top:240},500, 'linear').animate({left:800,top:230},500, 'linear').animate({left:790,top:210},500, 'linear').animate({left:820,top:200},500, 'linear').animate({left:850,top:130},500, 'linear').animate({left:940,top:60},500, 'linear').animate({left:980,top:0},500, 'linear').animate({left:30,top:400},0,'linear').animate({left:30,top:400},1500,bottleone);

+

$("#bottle1").show().animate({left:50,top:250},500, 'linear').animate({left:80,top:220},500, 'linear').animate({left:100,top:240},500, 'linear').animate({left:140,top:200},500, 'linear').animate({left:195,top:227},500, 'linear').animate({left:230,top:205},500, 'linear').animate({left:250,top:229},500, 'linear').animate({left:260,top:250},500, 'linear').animate({left:238,top:260},500, 'linear').animate({left:250,top:250},500, 'linear').animate({left:300,top:250},500, 'linear').animate({left:350,top:235},500, 'linear').animate({left:400,top:230},500, 'linear').animate({left:450,top:240},500, 'linear').animate({left:520,top:230},500, 'linear').animate({left:580,top:250},500, 'linear').animate({left:560,top:235},500, 'linear').animate({left:600,top:225},500, 'linear').animate({left:630,top:220},500, 'linear').animate({left:650,top:230},500, 'linear').animate({left:690,top:240},500, 'linear').animate({left:730,top:240},500, 'linear').animate({left:780,top:260},500, 'linear').animate({left:850,top:250},500, 'linear').animate({left:820,top:240},500, 'linear').animate({left:800,top:230},500, 'linear').animate({left:790,top:210},500, 'linear').animate({left:820,top:200},500, 'linear').animate({left:850,top:130},500, 'linear').animate({left:940,top:60},500, 'linear').animate({left:980,top:-30},500, 'linear').animate({left:30,top:400},0,'linear').animate({left:30,top:400},1500,bottleone);

}

−

~~function bottletwo() {~~

−

~~$("#bottle2").css({left:270,top:220});~~

−

$("#bottle2").show().animate({left:345,top:227},500, 'linear').animate({left:445,top:233},500, 'linear').animate({left:567,top:229},500, 'linear').animate({left:660,top:217},500, 'linear').animate({left:788,top:182},500, 'linear').animate({left:905,top:117},500, 'linear').animate({left:983,top:67},500, 'linear').animate({left:1000,top:0},500, 'linear').animate({left:0,top:0},0, 'linear').animate({left:50,top:100},500, 'linear').animate({left:120,top:150},500, 'linear').animate({left:195,top:199},500, 'linear').animate({left:270,top:220},500,'linear',bottletwo);

−

}

−

~~function bottlethree() {~~

−

~~$("#bottle3").css({left:660,top:217});~~

−

$("#bottle3").show().animate({left:788,top:182},500, 'linear').animate({left:905,top:117},500, 'linear').animate({left:983,top:67},500, 'linear').animate({left:1000,top:0},500, 'linear').animate({left:0,top:0},0, 'linear').animate({left:50,top:100},500, 'linear').animate({left:120,top:150},500, 'linear').animate({left:195,top:199},500, 'linear').animate({left:270,top:220},500, 'linear').animate({left:345,top:227},500, 'linear').animate({left:445,top:233},500, 'linear').animate({left:567,top:229},500, 'linear').animate({left:660,top:217},500,'linear',bottlethree);

−

}

function submenuteam(){

−

$("#TM").~~fadeToggle~~();

+

$("#TM").toggle();

−

$("#Col").~~fadeToggle~~();

+

$("#Col").toggle();

−

$("#PhA").~~fadeToggle~~()

+

$("#PhA").toggle()

}

−

~~function submenuparts(){~~

−

~~$("#Ove").fadeToggle();~~

−

~~$("#Bas").fadeToggle();~~

−

~~$("#Comp").fadeToggle();~~

−

~~$("#Colc").fadeToggle();~~

−

}

function submenuhuman(){

−

$("#HP").~~fadeToggle~~();

+

$("#HP").toggle();

−

$("#EnE").~~fadeToggle~~();

+

$("#EnE").toggle();

}

function submenumodel(){

−

$("#Bac").~~fadeToggle~~();

+

$("#Bac").toggle();

−

$("#Kin").~~fadeToggle~~();

+

$("#Kin").toggle();

−

$("#Met").~~fadeToggle~~();

+

$("#Met").toggle();

−

$("#Gen").~~fadeToggle~~();

+

$("#Gen").toggle();

+

$("#Overall").toggle();

}

−

$(document).ready(bottleone~~).ready(bottletwo).ready(bottlethree~~);

+

$(document).ready(bottleone);

$("#team1").click(submenuteam);

−

~~$("#parts1").click(submenuparts);~~

$("#human1").click(submenuhuman);

$("#model1").click(submenumodel);

Line 709:

Line 699:

−

+

−

+

−

<~~!-- <img class="bottles"~~ id="~~bottle2" src="https://static.igem.org/mediawiki/2018/2/20/T--RHIT--FloatingBottle.jpg~~">

+

−

+

</a>

−

+

−

+

−

-->

+

Line 731:

Line 718:

−

~~</a>~~

−

~~<a class = "teamSubPhA" id="PhA" href="https://2018.igem.org/Team:RHIT/Photos">~~

−

~~<img src="https://static.igem.org/mediawiki/2018/a/af/T--RHIT--PhotoAlbumA.jpg" width="40%">~~

</a>

+

+

</a>

−

+

−

~~<img class="parts" id="parts1" src="https://static.igem.org/mediawiki/2018/e/ed/T--RHIT--Parts.jpg">~~

+

−

+

</a>

−

+

−

~~<img src="https://static.igem.org/mediawiki/2018/c/c3/T--RHIT--OVerviewA.jpg" width="50%~~">

+

−

~~</a>~~

+

−

~~<a class="partsSubBas" id="Bas" href="https://2018.igem.org/Team:RHIT/Basic_Part">~~

+

−

<img ~~src="https://static.igem.org/mediawiki/2018/6/6a/T--RHIT--BasicPartsA.jpg" width="50%">~~

+

−

~~</a>~~

+

−

<a class="~~partsSubComp~~" ~~id="Comp" href="https://2018.igem.org/Team:RHIT/Composite_Part">~~

+

−

~~<img~~ src="https://static.igem.org/mediawiki/2018/3/3d/T--RHIT--~~CompositePartsA~~.jpg~~" width="50%~~">

+

−

~~</a>~~

+

−

~~<a class="partsSubColc" id="Colc" href="https://2018.igem.org/Team:RHIT/Part_Collection">~~

+

−

~~<img src="https://static.igem.org/mediawiki/2018/7/71/T--RHIT--CollectionA.jpg" width="50%">~~

+

−

</a>

+

Line 771:

Line 745:

−

+

Line 787:

Line 761:

</a>

+

+

+

</a>

Line 819:

Line 796:

+

+

<h6> Connect with us on Facebook! </h6>

−

+

</a>

Line 831:

Line 810:

−

+

</a>

Line 839:

Line 818:

<h6> Contact Us! </h6>

−

<p style="text-align: center"> 5500 Wabash Ave. </br> Terre Haute, IN 47803 </p>

+

<p style="text-align: center"> patekm@rose-hulman.edu </br> 5500 Wabash Ave. </br> Terre Haute, IN 47803 </p>

</center>

</div>

@@ Line 15: / Line 15: @@
 		/* Change Background color*/
 			body {
-				background-color: #E0FDFC;
+				background-color: #e0fdfc;
 			}
@@ Line 56: / Line 57: @@
 		/* Change Background color*/
 			body {
-				background-color: #8a9b9a;
+				background: url("https://static.igem.org/mediawiki/2018/9/97/T--RHIT--ROCKS.jpg");
+                                background-size: 100%;
+                                background-repeat: no-repeat;
+                                background-attachment: fixed;
 			}
 		/* Creates a container that will wrap all of the content inside your wiki pages. */
 			#mainContainer {
-				width:113.6%;
+				width:113.75%;
 				overflow:hidden;
-			        padding:auto;
+			        padding-top:0px;
                                  position:absolute;
                                  top:350px;
-                                 padding-bottom: 100px;
+                                 padding-bottom: 200px;
                                  text-align:left;
                			background-color:#E0FDFC;
@@ Line 73: / Line 77: @@
                    #contentContainer {
-                                position:absolute
                                  padding-top:5%;
                                  padding-left:2%;
                                  padding-right:3%;
-                                 padding-bottom: 100px;
+                                 padding-bottom: 200px;
                                  width: 110%;
-                                 float:left
+                                 float:left;
                                  background-color:#E0FDFC;
                                  font-family: "Arial", Helvetica, sans-serif;
@@ Line 109: / Line 113: @@
 		font-family: "Arial Black", Gadget, sans-serif;
 		padding: 5px 0px;
-                 font-size: 200%
+                 font-size: 150%
 	}
@@ Line 116: / Line 120: @@
 		border-bottom:0px;
 		font-family: "Elephant", Gadget, sans-serif;
-		padding: 5px 0px;
+		padding: 10px 0px;
-                 font-size: 230%
+                 font-size: 200%
 	}
          #contentContainer h5
@@ Line 124: / Line 128: @@
 		color: #51A8A5;
 		font-family: "Elephant", Gadget, sans-serif;
-		padding: 5px 0px;
+		padding: 10px 0px;
                  font-size: 200%
 	}
@@ Line 130: / Line 134: @@
           {
 		border-bottom:0px;
-		font-family: "Elephant", Gadget, sans-serif;
+		font-family: "Niagra Solid", Gadget, sans-serif;
 		padding: 5px 0px;
                  font-size: 130%
@@ Line 139: / Line 143: @@
 /*Style of the links - links are different inside the menu */
-	#contentContainer a {
+	      a {
-                 color: #034FEC;
+                 color: #078c96;
 		font-weight: bold;
-		text-decoration: underline;
+		text-decoration-color:#078c96;
-		text-decoration-color:#034FEC;
 		transition: all 0.4s ease;
 		-webkit-transition: all 0.4s ease;
@@ Line 152: / Line 155: @@
 /* Styling links on hover- links are different inside the menu */
-	#contentContainer a:hover {
+	     a:hover {
-		color: #f8b732;
+		color: #3bd3a8;
 		text-decoration:none;
 	                           }
@@ Line 159: / Line 162: @@
 /*Change the styling of tables */
      	 #contentContainer table {
-		border: 1px solid #928b8b;
+		border: 1px solid #000000;
 		border-collapse: collapse;
 		font-size: 130%;
@@ Line 167: / Line 170: @@
 /*Change the styling of table cells*/
      	#contentContainer  td {
-		border: 1px solid #c4baba;
+		border: 1px solid #000000;
 		border-collapse: collapse;
-		font-size: 105%;
+                background-color: #c8ff9e;
-		padding: 10px;
+		font-size: 100%;
-		vertical-align: text-top;
+		padding: 10px;
+                line-height:30px;
+                text-align:center;
 	                      }
 /*Change the styling of table headers */
      	#contentContainer th {
-		background-color:#c4baba;
+		background-color:#7ed7db;
-		border: 1px solid #928b8b;
+		border: 1px solid #000000;
 		border-collapse: collapse;
-		font-size: 110%;
+		font-size: 100%;
-		padding: 10px;
+		padding: 10px 20px;
-		vertical-align: text-top;
+                text-align: center;
 	}
 /*links*/
-                          a:link { color:#efefef; background-color:transparent; text-decoration:none}
+                          a:link { color:#078c96; background-color:transparent; text-decoration:none}
-                          a:visited { color:#efefef; background-color:transparent; text-decoration:none}
+                          a:visited { color:#078c96; background-color:transparent; text-decoration:none}
-                          a:hover { color:#64afb3; background-color:transparent; text-decoration:none}
+                          a:hover { color:#3bd3a8; background-color:transparent; text-decoration:none}
-                          a:active { color:#efefef; background-color:transparent; text-decoration:none}
+                          a:active { color:#078c96; background-color:transparent; text-decoration:none}
@@ Line 242: / Line 247: @@
    position: absolute;
    top: 80%;
-   left: 50%;
+   left:50%;
-   vertical-align: middle;
+   text-align: center;
    transform: translate(-50%, -50%);
    -ms-transform: translate(-50%, -50%);
-  text-align: center;
 }
@@ Line 283: / Line 287: @@
 }
+.center {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    width: 45%;
+}
 /**************************************************************************************************************************************************************************************************/
@@ Line 352: / Line 361: @@
 	/* 100% */
-	#mainContainer .column.full_size { width:80%; }
+	#mainContainer .column.full_size { width:83%; }
 	/* 66% */
@@ Line 414: / Line 423: @@
 /*buttons for the menu*/
+.pebble {
+    position:absolute;
+    left:166px;
+    top:30px;
+    z-index:0.5;
+    width:75%;
+}
+.topscroll {
+   position:absolute;
+   right:20px;
+   bottom:200px;
+   width:13%;
+   }
                       .home {
@@ Line 425: / Line 450: @@
                              left: 138px;
                              top: 110px;
+                            cursor:pointer;
                              }
@@ Line 463: / Line 489: @@
                         top: 190px;
                         left: 405px;
+                       cursor:pointer;
                            }
-                                          .partsSubOve{
-                                                position:absolute;
-                                                top:262px;
-                                                left:424px;
-                                                display: none;
-                                                z-index:1;
-                                                      }
-                                          .partsSubBas{
-                                               position:absolute;
-                                               top:285px;
-                                               left:415px;
-                                               display: none;
-                                               z-index:1;
-                                                      }
-                                          .partsSubComp{
-                                                position:absolute;
-                                                top:322px;
-                                                left:390px;
-                                                display: none;
-                                                z-index:1;
-                                                      }
-                                          .partsSubColc{
-                                                position:absolute;
-                                                top:368px;
-                                                left:375px;
-                                                display: none;
-                                                z-index:1;
-                                                        }
@@ Line 506: / Line 501: @@
                       .model{
                         position:absolute;
-                        top:118px;
+                        top:127px;
-                        left:770px;
+                        left:760px;
+                       cursor:pointer;
                             }
                                            .modelSubBac{
@@ Line 536: / Line 532: @@
                                                  position:absolute;
                                                  top:320px;
+                                                left:800px;
+                                                display: none;
+                                                z-index:2;
+                                                        }
+                                          .modelSubOve{
+                                                position:absolute;
+                                                top:364px;
                                                  left:800px;
                                                  display: none;
                                                  z-index:1;
                                                          }
                        .judge{
@@ Line 552: / Line 554: @@
                           top:160px;
                           left:635px;
+                         cursor:pointer;
                              }
@@ Line 575: / Line 578: @@
     color:#000000;
     }
+.green {
+    color:#51A8A5;
+}
@@ Line 638: / Line 643: @@
 function bottleone() {
           $("#bottle1").css({left:30,top:400},500);
-          $("#bottle1").show().animate({left:50,top:250},500, 'linear').animate({left:80,top:220},500, 'linear').animate({left:100,top:240},500, 'linear').animate({left:140,top:200},500, 'linear').animate({left:195,top:227},500, 'linear').animate({left:230,top:205},500, 'linear').animate({left:250,top:229},500, 'linear').animate({left:260,top:250},500, 'linear').animate({left:238,top:260},500, 'linear').animate({left:250,top:250},500, 'linear').animate({left:300,top:250},500, 'linear').animate({left:350,top:235},500, 'linear').animate({left:400,top:230},500, 'linear').animate({left:450,top:240},500, 'linear').animate({left:520,top:230},500, 'linear').animate({left:580,top:250},500, 'linear').animate({left:560,top:235},500, 'linear').animate({left:600,top:225},500, 'linear').animate({left:630,top:220},500, 'linear').animate({left:650,top:230},500, 'linear').animate({left:690,top:240},500, 'linear').animate({left:730,top:240},500, 'linear').animate({left:780,top:260},500, 'linear').animate({left:850,top:250},500, 'linear').animate({left:820,top:240},500, 'linear').animate({left:800,top:230},500, 'linear').animate({left:790,top:210},500, 'linear').animate({left:820,top:200},500, 'linear').animate({left:850,top:130},500, 'linear').animate({left:940,top:60},500, 'linear').animate({left:980,top:0},500, 'linear').animate({left:30,top:400},0,'linear').animate({left:30,top:400},1500,bottleone);
+          $("#bottle1").show().animate({left:50,top:250},500, 'linear').animate({left:80,top:220},500, 'linear').animate({left:100,top:240},500, 'linear').animate({left:140,top:200},500, 'linear').animate({left:195,top:227},500, 'linear').animate({left:230,top:205},500, 'linear').animate({left:250,top:229},500, 'linear').animate({left:260,top:250},500, 'linear').animate({left:238,top:260},500, 'linear').animate({left:250,top:250},500, 'linear').animate({left:300,top:250},500, 'linear').animate({left:350,top:235},500, 'linear').animate({left:400,top:230},500, 'linear').animate({left:450,top:240},500, 'linear').animate({left:520,top:230},500, 'linear').animate({left:580,top:250},500, 'linear').animate({left:560,top:235},500, 'linear').animate({left:600,top:225},500, 'linear').animate({left:630,top:220},500, 'linear').animate({left:650,top:230},500, 'linear').animate({left:690,top:240},500, 'linear').animate({left:730,top:240},500, 'linear').animate({left:780,top:260},500, 'linear').animate({left:850,top:250},500, 'linear').animate({left:820,top:240},500, 'linear').animate({left:800,top:230},500, 'linear').animate({left:790,top:210},500, 'linear').animate({left:820,top:200},500, 'linear').animate({left:850,top:130},500, 'linear').animate({left:940,top:60},500, 'linear').animate({left:980,top:-30},500, 'linear').animate({left:30,top:400},0,'linear').animate({left:30,top:400},1500,bottleone);
                             }
-function bottletwo() {
-         $("#bottle2").css({left:270,top:220});
-         $("#bottle2").show().animate({left:345,top:227},500, 'linear').animate({left:445,top:233},500, 'linear').animate({left:567,top:229},500, 'linear').animate({left:660,top:217},500, 'linear').animate({left:788,top:182},500, 'linear').animate({left:905,top:117},500, 'linear').animate({left:983,top:67},500, 'linear').animate({left:1000,top:0},500, 'linear').animate({left:0,top:0},0, 'linear').animate({left:50,top:100},500, 'linear').animate({left:120,top:150},500, 'linear').animate({left:195,top:199},500, 'linear').animate({left:270,top:220},500,'linear',bottletwo);
-                          }
-function bottlethree() {
-         $("#bottle3").css({left:660,top:217});
-         $("#bottle3").show().animate({left:788,top:182},500, 'linear').animate({left:905,top:117},500, 'linear').animate({left:983,top:67},500, 'linear').animate({left:1000,top:0},500, 'linear').animate({left:0,top:0},0, 'linear').animate({left:50,top:100},500, 'linear').animate({left:120,top:150},500, 'linear').animate({left:195,top:199},500, 'linear').animate({left:270,top:220},500, 'linear').animate({left:345,top:227},500, 'linear').animate({left:445,top:233},500, 'linear').animate({left:567,top:229},500, 'linear').animate({left:660,top:217},500,'linear',bottlethree);
-                        }
 function submenuteam(){
-           $("#TM").fadeToggle();
+           $("#TM").toggle();
-           $("#Col").fadeToggle();
+           $("#Col").toggle();
-           $("#PhA").fadeToggle()
+           $("#PhA").toggle()
                        }
-function submenuparts(){
-          $("#Ove").fadeToggle();
-          $("#Bas").fadeToggle();
-          $("#Comp").fadeToggle();
-          $("#Colc").fadeToggle();
-                        }
 function submenuhuman(){
-          $("#HP").fadeToggle();
+          $("#HP").toggle();
-          $("#EnE").fadeToggle();
+          $("#EnE").toggle();
                        }
 function submenumodel(){
-          $("#Bac").fadeToggle();
+          $("#Bac").toggle();
-          $("#Kin").fadeToggle();
+          $("#Kin").toggle();
-          $("#Met").fadeToggle();
+          $("#Met").toggle();
-          $("#Gen").fadeToggle();
+          $("#Gen").toggle();
+         $("#Overall").toggle();
                         }
-           $(document).ready(bottleone).ready(bottletwo).ready(bottlethree);
+           $(document).ready(bottleone);
            $("#team1").click(submenuteam);
-          $("#parts1").click(submenuparts);
            $("#human1").click(submenuhuman);
            $("#model1").click(submenumodel);
@@ Line 709: / Line 699: @@
          <img src = "https://static.igem.org/mediawiki/2018/a/a5/T--RHIT--Banner2.jpg">
-     <div class="spin">   <img class="bottles" id="bottle1" src="https://static.igem.org/mediawiki/2018/2/20/T--RHIT--FloatingBottle.jpg">  </div>
+     <div class="spin">   <img class="bottles" id="bottle1" src="https://static.igem.org/mediawiki/2018/2/20/T--RHIT--FloatingBottle.jpg"> </div>
+<a id="top">
-  <!--     <img class="bottles" id="bottle2" src="https://static.igem.org/mediawiki/2018/2/20/T--RHIT--FloatingBottle.jpg">
+<img class="pebble" src = "https://static.igem.org/mediawiki/2018/a/ab/T--RHIT--PebbleSand.jpg">
+</a>
-        <img class="bottles" id="bottle3" src="https://static.igem.org/mediawiki/2018/2/20/T--RHIT--FloatingBottle.jpg">
--->
    <!----------- Menu and Submenus --------->
@@ Line 731: / Line 718: @@
         <a class = "teamSubCol" id="Col" href="https://2018.igem.org/Team:RHIT/Collaborations">
           <img src="https://static.igem.org/mediawiki/2018/b/bb/T--RHIT--CollaborationsA.jpg" width="40%">
-       </a>
-       <a class = "teamSubPhA" id="PhA" href="https://2018.igem.org/Team:RHIT/Photos">
-         <img src="https://static.igem.org/mediawiki/2018/a/af/T--RHIT--PhotoAlbumA.jpg" width="40%">
         </a>
+<a href = "https://2018.igem.org/Team:RHIT/Description">
        <img class="project" src="https://static.igem.org/mediawiki/2018/archive/e/e6/20180627182502%21T--RHIT--Project.jpg">
+</a>
+<a href="https://2018.igem.org/Team:RHIT/Parts">
-    <img class="parts" id="parts1" src="https://static.igem.org/mediawiki/2018/e/ed/T--RHIT--Parts.jpg">
+     <img class="parts" src="https://static.igem.org/mediawiki/2018/e/ed/T--RHIT--Parts.jpg">
+</a>
-    <a class="partsSubOve" id="Ove" href="https://2018.igem.org/Team:RHIT/Parts">
-      <img src="https://static.igem.org/mediawiki/2018/c/c3/T--RHIT--OVerviewA.jpg" width="50%">
-     </a>
-    <a class="partsSubBas" id="Bas" href="https://2018.igem.org/Team:RHIT/Basic_Part">
-      <img src="https://static.igem.org/mediawiki/2018/6/6a/T--RHIT--BasicPartsA.jpg" width="50%">
-    </a>
-    <a class="partsSubComp" id="Comp" href="https://2018.igem.org/Team:RHIT/Composite_Part">
-      <img src="https://static.igem.org/mediawiki/2018/3/3d/T--RHIT--CompositePartsA.jpg" width="50%">
-    </a>
-    <a class="partsSubColc" id="Colc" href="https://2018.igem.org/Team:RHIT/Part_Collection">
-      <img src="https://static.igem.org/mediawiki/2018/7/71/T--RHIT--CollectionA.jpg" width="50%">
-    </a>
@@ Line 771: / Line 745: @@
-   <img class = "model" id="model1" src="https://static.igem.org/mediawiki/2018/archive/8/84/20180627181721%21T--RHIT--Awards.jpg">
+   <img class = "model" id="model1" src="https://static.igem.org/mediawiki/2018/6/64/T--RHIT--Model2.jpg" width="13%">
 <a class = "modelSubBac" id = "Bac" href="https://2018.igem.org/Team:RHIT/Model">
         <img src = "https://static.igem.org/mediawiki/2018/7/70/T--RHIT--Background.jpg" width="110%">
@@ Line 787: / Line 761: @@
         <img src = "https://static.igem.org/mediawiki/2018/7/78/T--RHIT--GeneticsModel.jpg" width="130%">
      </a>
+<a class =  "modelSubOve" id="Overall" href = "https://2018.igem.org/Team:RHIT/OverallModel">
+       <img src = "https://static.igem.org/mediawiki/2018/1/1e/T--RHIT--OverallModel.jpg" width="130%">
+</a>
@@ Line 819: / Line 796: @@
 <div class = "footer">
+<a href = "#top">
+<img class = "topscroll" src="https://static.igem.org/mediawiki/2018/5/53/T--RHIT--TotheTopSuperPebble.png"> </a>
 <div class="column footer_size">
 <center>
 <h6> Connect with us on Facebook! </h6>
-<a href="https://www.facebook.com/RHITiGEM2018/">
+<a href="https://www.facebook.com/RHITiGEM2018/" target="_blank">
 <img src="https://static.igem.org/mediawiki/2018/9/98/T--RHIT--Facebook.jpg" style="width:30%">
 </a>
@@ Line 831: / Line 810: @@
 <div class = "clear extra_space"></div>
 <div class = "clear extra_space"></div>
-<a href="https://www.rose-hulman.edu/">
+<a href="https://www.rose-hulman.edu/" target="_blank">
 <img src="https://static.igem.org/mediawiki/2018/a/ad/T--RHIT--RoseLogo.jpg" style="width:60%">
 </a>
@@ Line 839: / Line 818: @@
 <center>
 <h6> Contact Us! </h6>
-<p style="text-align: center"> 5500 Wabash Ave. </br> Terre Haute, IN 47803 </p>
+<p style="text-align: center"> patekm@rose-hulman.edu </br> 5500 Wabash Ave. </br> Terre Haute, IN 47803 </p>
 </center>
 </div>
 </div>