Difference between revisions of "Team:SJTU-software"

Revision as of 14:41, 17 October 2018 (view source)

VOIX (Talk | contribs)

← Older edit

Latest revision as of 08:55, 2 December 2018 (view source)

VOIX (Talk | contribs)

(17 intermediate revisions by 2 users not shown)

Line 5:

div#content { width:1200px; display: inline-block;

vertical-align: middle;

+

margin-top:0px;

width:100%;

height:100%;

Line 24:

Line 25:

line-height: 1.5em;

color: #6b3b25;

−

background: url(https://static.igem.org/mediawiki/2018/1/12/T--SJTU-software--H-background.~~png~~);

+

background: url(https://static.igem.org/mediawiki/2018/b/b9/T--SJTU-software--H-background.jpg);

background-size: 100%;

}

Line 41:

Line 42:

float: left;

clear: both;

−

background-image: url(https://static.igem.org/mediawiki/2018/7/7e/T--SJTU-software--H-project.png);

+

background-image: url(https://static.igem.org/mediawiki/2018/archive/7/7e/20181017145320%21T--SJTU-software--H-project.png);

left:570px;

bottom:620px;

Line 51:

Line 52:

float: left;

clear: both;

−

background-image: url(https://static.igem.org/mediawiki/2018/c/ca/T--SJTU-software--H-~~design~~.png);

+

background-image: url(https://static.igem.org/mediawiki/2018/f/fb/T--SJTU-software--H-Design.png);

left:435px;

bottom:305px;

Line 61:

Line 62:

float: left;

clear: both;

−

background-image: url(https://static.igem.org/mediawiki/2018/6/60/T--SJTU-software--H-HP.png);

+

background-image: url(https://static.igem.org/mediawiki/2018/archive/6/60/20181017145003%21T--SJTU-software--H-HP.png);

left:202px;

bottom:300px;

Line 81:

Line 82:

float: left;

clear: both;

−

background-image: url(https://static.igem.org/mediawiki/2018/e/e8/T--SJTU-software--H-~~team~~.png);

+

background-image: url(https://static.igem.org/mediawiki/2018/7/72/T--SJTU-software--H-Team.png);

left:385px;

bottom:880px;

Line 91:

Line 92:

float: left;

clear: both;

−

background-image: url(https://static.igem.org/mediawiki/2018/3/38/T--SJTU-software--H-~~demo~~.png);

+

background-image: url(https://static.igem.org/mediawiki/2018/9/9d/T--SJTU-software--H-Demo.png);

left:638px;

bottom:950px;

Line 101:

Line 102:

float: left;

clear: both;

−

background-image: url(https://~~raw~~.~~githubusercontent~~.~~com~~/~~sjtusoftware2018~~/~~2018iGEM_wiki~~/~~master~~/~~images~~/H-~~game~~.png);

+

background-image: url(https://static.igem.org/mediawiki/2018/f/f1/T--SJTU-software--H-Game.png);

left:690px;

bottom:700px;

Line 111:

Line 112:

float: left;

clear: both;

−

background-image: url(https://static.igem.org/mediawiki/2018/0/09/T--SJTU-software--H-~~video~~.png);

+

background-image: url(https://static.igem.org/mediawiki/2018/4/4c/T--SJTU-software--H-Video.png);

left:195px;

bottom:862px;

Line 123:

Line 124:

width: 1000px;

margin: auto auto auto auto;

−

background: transparent;

+

background: transparent;}

+

.bin{

-webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);

-moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);

Line 165:

Line 167:

margin-right: auto;

margin-top: auto;

−

margin-bottom: auto;"><img src="https://static.igem.org/mediawiki/2018/1/15/T--SJTU-software--~~hometitle~~.~~PNG~~" align="center"></img></div>

+

margin-bottom: auto;"><img src="https://static.igem.org/mediawiki/2018/4/4c/T--SJTU-software--headboy.png" align="center" style="height:150px;padding-left:450px;"></img>

+

<div class="works-wrapper" style="

margin-left: auto;

Line 175:

Line 178:

−

+

+

−

<div class="wrapper" style="

+

<!--<div class="wrapper" style="

margin-left: auto;

margin-right: auto;

margin-top: 30px;

−

margin-bottom: auto;~~"><img src="https://static.igem.org/mediawiki/2018/1/15/T--SJTU-software--H-title2.png~~" align="center"~~></img~~>

+

margin-bottom: auto;" align="center;">

−

<img src="https://static.igem.org/mediawiki/2018/0/05/T--SJTU-software--H-~~title3~~.png" ~~align="center"></img>~~

+

−

~~<img src~~="~~http~~:~~//www.diyiziti.com/Res/Images//Temp/239/efa73b6392394141838b29b8ce6863fc.PNG" align="center~~"></img>

+

−

~~<img src="http://www.diyiziti.com/Res/Images//Temp/238/019883cc92b14ff38c280e94ec3baa59.PNG" align="center"></img>~~

+

</div>-->

−

<~~img src="http:~~/~~/www.diyiziti.com/Res/Images//Temp/135/cd427f2dcfd44bd1816fb27f8b32d99b.PNG" align="center"~~>~~</img>~~

+

−

~~</div~~>

+

</body>

<html>

@@ Line 5: / Line 5: @@
      div#content { width:1200px; display: inline-block;
              vertical-align: middle;
+            margin-top:0px;
              width:100%;
              height:100%;
@@ Line 24: / Line 25: @@
          line-height: 1.5em;
          color: #6b3b25;
-         background: url(https://static.igem.org/mediawiki/2018/1/12/T--SJTU-software--H-background.png);
+         background: url(https://static.igem.org/mediawiki/2018/b/b9/T--SJTU-software--H-background.jpg);
          background-size: 100%;
 }
@@ Line 41: / Line 42: @@
        float: left;
        clear: both;
-	  background-image: url(https://static.igem.org/mediawiki/2018/7/7e/T--SJTU-software--H-project.png);
+	  background-image: url(https://static.igem.org/mediawiki/2018/archive/7/7e/20181017145320%21T--SJTU-software--H-project.png);
          left:570px;
          bottom:620px;
@@ Line 51: / Line 52: @@
        float: left;
        clear: both;
-	  background-image: url(https://static.igem.org/mediawiki/2018/c/ca/T--SJTU-software--H-design.png);
+	  background-image: url(https://static.igem.org/mediawiki/2018/f/fb/T--SJTU-software--H-Design.png);
          left:435px;
          bottom:305px;
@@ Line 61: / Line 62: @@
        float: left;
        clear: both;
-	  background-image: url(https://static.igem.org/mediawiki/2018/6/60/T--SJTU-software--H-HP.png);
+	  background-image: url(https://static.igem.org/mediawiki/2018/archive/6/60/20181017145003%21T--SJTU-software--H-HP.png);
          left:202px;
          bottom:300px;
@@ Line 81: / Line 82: @@
        float: left;
        clear: both;
-	  background-image: url(https://static.igem.org/mediawiki/2018/e/e8/T--SJTU-software--H-team.png);
+	  background-image: url(https://static.igem.org/mediawiki/2018/7/72/T--SJTU-software--H-Team.png);
          left:385px;
          bottom:880px;
@@ Line 91: / Line 92: @@
        float: left;
        clear: both;
-	  background-image: url(https://static.igem.org/mediawiki/2018/3/38/T--SJTU-software--H-demo.png);
+	  background-image: url(https://static.igem.org/mediawiki/2018/9/9d/T--SJTU-software--H-Demo.png);
          left:638px;
          bottom:950px;
@@ Line 101: / Line 102: @@
        float: left;
        clear: both;
-	  background-image: url(https://raw.githubusercontent.com/sjtusoftware2018/2018iGEM_wiki/master/images/H-game.png);
+	  background-image: url(https://static.igem.org/mediawiki/2018/f/f1/T--SJTU-software--H-Game.png);
          left:690px;
          bottom:700px;
@@ Line 111: / Line 112: @@
        float: left;
        clear: both;
-	  background-image: url(https://static.igem.org/mediawiki/2018/0/09/T--SJTU-software--H-video.png);
+	  background-image: url(https://static.igem.org/mediawiki/2018/4/4c/T--SJTU-software--H-Video.png);
          left:195px;
          bottom:862px;
@@ Line 123: / Line 124: @@
          width: 1000px;
          margin: auto auto auto auto;
-         background: transparent;
+         background: transparent;}
+    .bin{
          -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
          -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
@@ Line 165: / Line 167: @@
      margin-right:  auto;
      margin-top:  auto;
-     margin-bottom:  auto;"><img src="https://static.igem.org/mediawiki/2018/1/15/T--SJTU-software--hometitle.PNG" align="center"></img></div>
+     margin-bottom:  auto;"><img src="https://static.igem.org/mediawiki/2018/4/4c/T--SJTU-software--headboy.png" align="center" style="height:150px;padding-left:450px;"></img>
+                           <img src="https://static.igem.org/mediawiki/2018/e/ee/T--SJTU-software--H-box2.jpg" align="center" style="width:500px;padding-bottom:40px;height:90px;"></img></div>
 <div class="works-wrapper" style="
      margin-left: auto;
@@ Line 175: / Line 178: @@
 	<a id="HOME-2" href="https://2018.igem.org/Team:SJTU-software/Design"></a>
 	<a id="HOME-3" href="https://2018.igem.org/Team:SJTU-software/Human_Practices"></a>
-	<a id="HOME-4" href="http://metlab-sjtu.com"></a>
+	<a id="HOME-4" href="http://weibohot.org"></a>
+<!--    <a id="HOME-4" href="http://metlab-sjtu.com"></a>-->
 	<a id="HOME-5" href="https://2018.igem.org/Team:SJTU-software/Team"></a>
          <a id="HOME-6" href="https://2018.igem.org/Team:SJTU-software/Demonstrate"></a>
          <a id="HOME-7" href="https://2018.igem.org/Team:SJTU-software/Public_Engagement"></a>
 	<a id="HOME-8" href="https://2018.igem.org/Team:SJTU-software/Video"></a></div>
-<div class="wrapper" style="
+<!--<div class="wrapper" style="
      margin-left: auto;
      margin-right:  auto;
      margin-top:  30px;
-     margin-bottom:  auto;"><img src="https://static.igem.org/mediawiki/2018/1/15/T--SJTU-software--H-title2.png" align="center"></img>
+     margin-bottom:  auto;" align="center;">
-                            <img src="https://static.igem.org/mediawiki/2018/0/05/T--SJTU-software--H-title3.png" align="center"></img>
+                            <img src="https://static.igem.org/mediawiki/2018/5/5d/T--SJTU-software--H-foot.png" style="position: relative;"></img>
-                           <img src="http://www.diyiziti.com/Res/Images//Temp/239/efa73b6392394141838b29b8ce6863fc.PNG" align="center"></img>
-                            <img src="http://www.diyiziti.com/Res/Images//Temp/238/019883cc92b14ff38c280e94ec3baa59.PNG" align="center"></img>
+</div>-->
-                           <img src="http://www.diyiziti.com/Res/Images//Temp/135/cd427f2dcfd44bd1816fb27f8b32d99b.PNG" align="center"></img>
-</div>
 </body>
 <html>