Difference between revisions of "Template:BioMarvel"

Revision as of 10:10, 30 September 2018 (view source)

Csw2669 (Talk | contribs)

← Older edit

Latest revision as of 08:52, 25 November 2018 (view source)

Jennydchoi (Talk | contribs)

(Undo revision 493406 by Jennydchoi (talk))

(43 intermediate revisions by 2 users not shown)

Line 279:

margin-top: 20px;

}

+

a, a:visited, a:active, a:link{

Line 300:

Line 301:

.mHeader{

width: auto;

−

min-width: ~~480px~~;

+

min-width: 540px;

min-height: 130px;

margin-left: auto;

margin-right: auto;

}

−

~~.mHeader_logo_box{~~

−

~~width: 300px;~~

−

~~height: 100px;~~

−

~~margin-left: auto;~~

−

~~margin-right: auto;~~

−

~~padding-bottom: 10px;~~

−

~~padding-top: 10px;~~

−

}

−

.mBtn-menu {

Line 359:

Line 350:

max-width: 300px;

margin-top: 20px;

+

margin-left: 30px;

position: relative;

float: left;

Line 426:

Line 418:

background-color: #203864;

}

+

.mMomenu{

+

height: 110px;

+

}

+

a:active{

color: #c79e19;

+

}

+

img.mTitle-logoside {

+

height: 60px;

+

width: auto;

+

margin-top: 30px;

+

margin-bottom: 29px;

+

margin-left: -23px;

}

Line 441:

Line 444:

.mHeader_logo_box{

−

width: ~~300px~~;

+

width: 390px;

height: 100px;

margin-left: auto;

Line 545:

Line 548:

.submenuLink:hover {

color: #c79e19 !important;

+

}

+

img.mTitle-logoside {

+

height: 60px;

+

width: auto;

+

margin-top: 39px;

+

margin-bottom: 20px;

+

margin-left: -30px;

}

Line 553:

Line 564:

width: auto;

max-width: 1080px;

−

min-width: ~~480px~~;

+

min-width: 540px;

margin-left: auto;

margin-right: auto;

Line 574:

Line 585:

margin-left: 10px;

margin-right: 10px;

−

margin-top: ~~20px~~;

+

margin-top: 40px;

margin-bottom: 20px;

font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif;

}

−

#mSection h1 { font-size: 210%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: ~~10px~~;}

+

#mSection h1 { font-size: 210%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 30px; color: #203864; line-height: 100%;}

−

#mSection h2 { font-size: 190%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: ~~10px~~;}

+

#mSection h2 { font-size: 190%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 30px; color: #203864; line-height: 100%;}

−

#mSection h3 { font-size: 170%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: ~~10px~~;}

+

#mSection h3 { font-size: 170%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 30px; color: #203864; line-height: 100%;}

−

#mSection h4 { font-size: 150%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: ~~10px~~;}

+

#mSection h4 { font-size: 150%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 30px; color: #203864; line-height: 100%;}

−

#mSection h5 { font-size: 140%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: ~~10px~~;}

+

#mSection h5 { font-size: 140%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 30px; color: #203864; line-height: 100%;}

−

#mSection h6 { font-size: 130%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: ~~10px~~;}

+

#mSection h6 { font-size: 130%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 30px; color: #203864; line-height: 100%;}

−

#mSection p{ font-size: ~~130~~%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: ~~5px~~;}

+

#mSection p{ font-size: 145%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 10px;}

−

#mSection ul{margin-bottom: ~~5px~~;}

+

#mSection ul{margin-bottom: 15px;}

+

#mSection li{font-size: 145%; margin-bottom: 10px;}

#mSection a{font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif;}

Line 593:

Line 605:

.myimg{

−

width: 95%;

+

max-width: 95%;

−

~~max-width~~: ~~1000px~~;

+

display: block;

margin-left: auto;

margin-right: auto;

+

margin-top: 20px;

+

margin-bottom: 20px;

+

}

+

.myVideo{

+

max-width: 95%;

+

display: block;

+

margin-left: auto;

+

margin-right: auto;

+

margin-top: 20px;

+

margin-bottom: 40px;

+

}

+

.mNoteBookJH{

+

width: 100%;

+

height: 40px;

+

display: block;

+

margin-top: 20px;

+

padding-left: 10px;

+

}

+

.mNoteBookJ{

+

display: none;

+

width: 100%;

+

margin-bottom: 20px;

+

padding-left: 15px;

}

</style>

</head>

−

<body>

−

+

+

+

+

</a>

</div>

Line 615:

Line 653:

<a class="menuLink">PROJECT▾</a>

−

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Project/Description"~~>Description</a></li>~~

+

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Project/Description" style="margin-top: 10px;">Description</a></li>

−

~~<li><a class~~="~~submenuLink longLink" href="https~~:~~//2018.igem.org/Team:BioMarvel/Project/Heart failure~~">~~Heart failure~~</a></li>

+

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Demonstrate">Demonstrate</a></li>

−

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel~~/Project/Design">Design</a></li>~~

+

−

~~<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Project~~/Demonstrate">Demonstrate</a></li>

+

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Project/Parts">Parts</a></li>

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Project/Application">Application</a></li>

Line 628:

Line 664:

<ul>

−

+

−

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/WET_LAB/Experiments"~~>Experiments</a></li>~~

+

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/WET_LAB/Experiments" style="margin-top: 18px; line-height: 100%; margin-bottom: 8px;">Experiments<br> & Results</a></li>

−

~~<li><a class~~="~~submenuLink longLink" href="https~~:~~//2018.igem.org/Team~~:~~BioMarvel/WET_LAB/Results~~">Results</a></li>

+

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/InterLab">InterLab</a></li>

−

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel~~/WET_LAB~~/InterLab">InterLab</a></li>

+

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/WET_LAB/Safety">Safety</a></li>

</ul>

Line 643:

Line 678:

<a class="menuLink">HUMAN PRACTICES▾</a>

−

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/~~Human_Practices/Overview~~"~~>Overview</a></li>~~

+

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Public_Engagement" style="margin-top: 10px;">Public Engagement</a></li>

−

~~<li><a class~~="~~submenuLink longLink" href="https~~:~~//2018.igem.org/Team:BioMarvel/Human_Practices~~">~~Human Practices~~</a></li>

+

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Human_Practices">Integrated Practices</a></li>

−

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Human_Practices~~/Integrated_Practices~~">Integrated Practices~~</a></li>~~

+

−

~~<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Human_Practices/Public_Engagement">Public Engagement~~</a></li>

+

</ul>

</li>

Line 656:

Line 689:

<a class="menuLink">NOTEBOOK▾</a>

−

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Notebook/Lab_Journal">Lab Journal</a></li>

+

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Notebook/Lab_Journal" style="margin-top: 10px;">Lab Journal</a></li>

−

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Notebook/Reference">~~Reference~~</a></li>

+

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Notebook/Reference">References</a></li>

</ul>

</li>

Line 667:

Line 700:

<a class="menuLink">PEOPLE▾</a>

−

+

−

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/~~People/Attribution~~">Attribution</a></li>

+

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Attributions">Attribution</a></li>

−

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/~~People/Collaboration~~">Collaboration</a></li>

+

<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Collaborations">Collaboration</a></li>

</ul>

</li>

</ul>

</div>

−

+

<ul>

−

<a class="menuLink" href="https://2018.igem.org/Team:BioMarvel/Achievement" style="cursor: pointer;">~~ACHIVEMENT~~</a>

+

<a class="menuLink" href="https://2018.igem.org/Team:BioMarvel/Achievement" style="cursor: pointer;">ACHIEVEMENT</a>

</li>

</ul>

</div>

−

+

<ul>

−

<a class="menuLink" href="https://2018.igem.org/Team:BioMarvel/~~Eenterpreneurship~~" style="cursor: pointer;">~~ENTERPRENEURSHIP~~</a>

+

<a class="menuLink" href="https://2018.igem.org/Team:BioMarvel/Entrepreneurship" style="cursor: pointer;">ENTREPRENEURSHIP</a>

</li>

</ul>

@@ Line 279: / Line 279: @@
 	margin-top: 20px;
 }
 a, a:visited, a:active, a:link{
@@ Line 300: / Line 301: @@
 .mHeader{
 	width: auto;
-	min-width: 480px;
+	min-width: 540px;
 	min-height: 130px;
 	margin-left: auto;
 	margin-right: auto;
 }
-.mHeader_logo_box{
-	width: 300px;
-	height: 100px;
-	margin-left: auto;
-	margin-right: auto;
-	padding-bottom: 10px;
-	padding-top: 10px;
-}
 .mBtn-menu {
@@ Line 359: / Line 350: @@
 	max-width: 300px;
 	margin-top: 20px;
+	margin-left: 30px;
 	position: relative;
 	float: left;
@@ Line 426: / Line 418: @@
 		background-color: #203864;
 	}
+	.mMomenu{
+		height: 110px;
+	}
 	a:active{
 		color: #c79e19;
+	}
+	img.mTitle-logoside {
+	height: 60px;
+	width: auto;
+	margin-top: 30px;
+	margin-bottom: 29px;
+	margin-left: -23px;
 	}
@@ Line 441: / Line 444: @@
 	.mHeader_logo_box{
-	width: 300px;
+	width: 390px;
 	height: 100px;
 	margin-left: auto;
@@ Line 545: / Line 548: @@
 	.submenuLink:hover {
 		color: #c79e19 !important;
+	}
+	img.mTitle-logoside {
+	height: 60px;
+	width: auto;
+	margin-top: 39px;
+	margin-bottom: 20px;
+	margin-left: -30px;
 	}
@@ Line 553: / Line 564: @@
 	width: auto;
 	max-width: 1080px;
-	min-width: 480px;
+	min-width: 540px;
 	margin-left: auto;
 	margin-right: auto;
@@ Line 574: / Line 585: @@
 	margin-left: 10px;
 	margin-right: 10px;
-	margin-top: 20px;
+	margin-top: 40px;
 	margin-bottom: 20px;
 	font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif;
 }
-#mSection h1 { font-size: 210%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 10px;}
+#mSection h1 { font-size: 210%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 30px; color: #203864; line-height: 100%;}
-#mSection h2 { font-size: 190%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 10px;}
+#mSection h2 { font-size: 190%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 30px; color: #203864; line-height: 100%;}
-#mSection h3 { font-size: 170%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 10px;}
+#mSection h3 { font-size: 170%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 30px; color: #203864; line-height: 100%;}
-#mSection h4 { font-size: 150%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 10px;}
+#mSection h4 { font-size: 150%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 30px; color: #203864; line-height: 100%;}
-#mSection h5 { font-size: 140%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 10px;}
+#mSection h5 { font-size: 140%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 30px; color: #203864; line-height: 100%;}
-#mSection h6 { font-size: 130%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 10px;}
+#mSection h6 { font-size: 130%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 30px; color: #203864; line-height: 100%;}
-#mSection p{ font-size: 130%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 5px;}
+#mSection p{ font-size: 145%;font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif; margin-bottom: 10px;}
-#mSection ul{margin-bottom: 5px;}
+#mSection ul{margin-bottom: 15px;}
+#mSection li{font-size: 145%; margin-bottom: 10px;}
 #mSection a{font-family: 'MavenPro-Regular', 'MavenPro-Bold', 'Arial', sans-serif;}
@@ Line 593: / Line 605: @@
 .myimg{
-	width: 95%;
+	max-width: 95%;
-	max-width: 1000px;
+	display: block;
 	margin-left: auto;
 	margin-right: auto;
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+.myVideo{
+	max-width: 95%;
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 20px;
+	margin-bottom: 40px;
+}
+.mNoteBookJH{
+	width: 100%;
+	height: 40px;
+	display: block;
+	margin-top: 20px;
+	padding-left: 10px;
+}
+.mNoteBookJ{
+	display: none;
+	width: 100%;
+	margin-bottom: 20px;
+	padding-left: 15px;
 }
 </style>
 </head>
 <body>
 	<header class="mHeader">
 		<div class="mHeader_logo_box">
-		<a href="https://2018.igem.org/Team:BioMarvel"><img class="mTitle-logo" src="https://static.igem.org/mediawiki/2018/archive/e/ec/20180918033248%21T--Biomarvel--TitleLogo.png" herf="https://2018.igem.org/Team:BioMarvel"></a>
+		<a href="https://2018.igem.org/Team:BioMarvel">
+			<img class="mTitle-logo" src="https://static.igem.org/mediawiki/2018/archive/e/ec/20180918033248%21T--Biomarvel--TitleLogo.png" herf="https://2018.igem.org/Team:BioMarvel">
+			<img class="mTitle-logoside" src="https://static.igem.org/mediawiki/2018/8/83/T--Biomarvel--sp8.gif">
+		</a>
 		<div class="mBtn-menu">&#8801;</div>
 		</div>
@@ Line 615: / Line 653: @@
 						<a class="menuLink">PROJECT▾</a>
 						<ul class="submenuC">
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Project/Description">Description</a></li>
+							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Project/Description" style="margin-top: 10px;">Description</a></li>
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Project/Heart failure">Heart failure</a></li>
+							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Demonstrate">Demonstrate</a></li>
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Project/Design">Design</a></li>
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Project/Demonstrate">Demonstrate</a></li>
 							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Project/Parts">Parts</a></li>
 							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Project/Application">Application</a></li>
@@ Line 628: / Line 664: @@
 				<ul>
 					<li class="topMenuLi">
-						<a class="menuLink">WET LAB▾</a>
+						<a class="menuLink" style="min-width: 75px;">LAB▾　　</a>
 						<ul class="submenuC">
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/WET_LAB/Experiments">Experiments</a></li>
+							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/WET_LAB/Experiments" style="margin-top: 18px; line-height: 100%; margin-bottom: 8px;">Experiments<br> & Results</a></li>
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/WET_LAB/Results">Results</a></li>
+							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/InterLab">InterLab</a></li>
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/WET_LAB/InterLab">InterLab</a></li>
 							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/WET_LAB/Safety">Safety</a></li>
 						</ul>
@@ Line 643: / Line 678: @@
 						<a class="menuLink">HUMAN PRACTICES▾</a>
 						<ul class="submenuC">
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Human_Practices/Overview">Overview</a></li>
+							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Public_Engagement" style="margin-top: 10px;">Public Engagement</a></li>
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Human_Practices">Human Practices</a></li>
+							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Human_Practices">Integrated Practices</a></li>
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Human_Practices/Integrated_Practices">Integrated Practices</a></li>
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Human_Practices/Public_Engagement">Public Engagement</a></li>
 						</ul>
 					</li>
@@ Line 656: / Line 689: @@
 						<a class="menuLink">NOTEBOOK▾</a>
 						<ul class="submenuC">
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Notebook/Lab_Journal">Lab Journal</a></li>
+							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Notebook/Lab_Journal" style="margin-top: 10px;">Lab Journal</a></li>
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Notebook/Reference">Reference</a></li>
+							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Notebook/Reference">References</a></li>
 						</ul>
 					</li>
@@ Line 667: / Line 700: @@
 						<a class="menuLink">PEOPLE▾</a>
 						<ul class="submenuC">
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/	Team:BioMarvel/People/Team">Team</a></li>
+							<li><a class="submenuLink longLink" href="https://2018.igem.org/	Team:BioMarvel/People/Team" style="margin-top: 10px;">Team</a></li>
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/People/Attribution">Attribution</a></li>
+							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Attributions">Attribution</a></li>
-							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/People/Collaboration">Collaboration</a></li>
+							<li><a class="submenuLink longLink" href="https://2018.igem.org/Team:BioMarvel/Collaborations">Collaboration</a></li>
 						</ul>
 					</li>
 				</ul>
 			</div>
-			<div class="mMenu_left">
+			<div class="mMenu_left mMomenu">
 				<ul>
 					<li class="topMenuLi">
-						<a class="menuLink" href="https://2018.igem.org/Team:BioMarvel/Achievement" style="cursor: pointer;">ACHIVEMENT</a>
+						<a class="menuLink" href="https://2018.igem.org/Team:BioMarvel/Achievement" style="cursor: pointer;">ACHIEVEMENT</a>
 					</li>
 				</ul>
 			</div>
-			<div class="mMenu_left">
+			<div class="mMenu_left mMomenu">
 				<ul>
 					<li class="topMenuLi">
-						<a class="menuLink" href="https://2018.igem.org/Team:BioMarvel/Eenterpreneurship" style="cursor: pointer;">ENTERPRENEURSHIP</a>
+						<a class="menuLink" href="https://2018.igem.org/Team:BioMarvel/Entrepreneurship" style="cursor: pointer;">ENTREPRENEURSHIP</a>
 					</li>
 				</ul>