Add files via upload

zyxiaooo · Oct 5, 2016 · eeb4654 · eeb4654
1 parent 1a42b8a
commit eeb4654
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 38 deletions.
diff --git a/aboutme.html b/aboutme.html
@@ -37,10 +37,10 @@
 				<div class="container">
 					<div class="row main-row">
 						<div class="2u 12u(mobile)">
+                        <div class="sidebar">
 
 							<section>
 								<h2>Contents</h2>
-								<div>
 									<div class="row">
 
 										<div class="12u 12u(mobile)">
@@ -51,9 +51,8 @@ <h2>Contents</h2>
 											</ul>
 										</div>
 									</div>
-								</div>
 							</section>
-
+                        </div>
 						</div>
 						<div class="10u 12u(mobile) important(mobile)">
 <!--<img src="images/pic2.jpg" style="float:right; width:300px; height=200px" /> 

diff --git a/assets/css/main.css b/assets/css/main.css
@@ -1199,6 +1199,31 @@
 			margin-top: 0;
 			border-top: 0;
 		}
+	.sidebar {
+				padding-top: 0em;
+				position: fixed;
+			}
+
+				.homepage .sidebar {
+					padding-top: 0;
+				}
+
+				.sidebar h2.major {
+					text-align: left;
+					margin: 0 0 1em 0;
+				}
+
+					.sidebar h2.major span {
+						padding-left: 0;
+					}
+
+			.content-left {
+				padding-right: 2em;
+			}
+
+			.content-right {
+				padding-left: 2em;
+			}
 
 	.button {
 		background-image: -moz-linear-gradient(top, #008dad, #007b9d);

diff --git a/images/MYXJ_20160925152322_fast.jpg b/images/MYXJ_20160925152322_fast.jpg
diff --git a/images/MYXJ_20160925153946_fast.jpg b/images/MYXJ_20160925153946_fast.jpg
diff --git a/images/MYXJ_20160925154012_fast.jpg b/images/MYXJ_20160925154012_fast.jpg
diff --git a/images/acadamic.pdf b/images/acadamic.pdf
diff --git a/images/marason.pdf b/images/marason.pdf
diff --git a/images/panwenyuan.pdf b/images/panwenyuan.pdf
diff --git a/project.html b/project.html
@@ -37,10 +37,10 @@
 				<div class="container">
 					<div class="row main-row">
 						<div class="2u 12u(mobile)">
+                        <div class="sidebar">
 
 							<section>
 								<h2>Contents</h2>
-								<div>
 									<div class="row">
 
 										<div class="12u 12u(mobile)">
@@ -58,9 +58,8 @@ <h2>Contents</h2>
 											</ul>
 										</div>
 									</div>
-								</div>
 							</section>
-
+                        </div>
 						</div>
 						<div class="10u 12u(mobile) important(mobile)">
 <!--<img src="images/pic2.jpg" style="float:right; width:300px; height=200px" /> 

diff --git a/research.html b/research.html
@@ -37,10 +37,9 @@
 				<div class="container">
 					<div class="row main-row">
 						<div class="2u 12u(mobile)">
-
+							<div class="sidebar">
 							<section>
 								<h2>Contents</h2>
-								<div>
 									<div class="row">
 										<div class="12u 12u(mobile)">
 											<ul class="link-list">
@@ -50,8 +49,8 @@ <h2>Contents</h2>
 											</ul>
 										</div>
 									</div>
-								</div>
 							</section>
+                            </div>
 
 						</div>
 				    <div class="9u 12u(mobile) important(mobile)">
@@ -98,36 +97,34 @@ <h3><font style="font-style:italic;">Internship at Intel Asia Pacific R & D Cent
                                 <li>GPU-GPU Copy</li><br>
                                 <li>Primitive Restart</li><br>
                                 <li>Multiple Render Target</li>
-
-                                <div class="box">
-  									<img src="images/model.PNG" width=500 height=400 alt = "Pic1. Transform Feedback" />
-  										 Pic 1. Transform Feedback
-								</div>
-                                <br><br>
-								<style>
-								.box{top: 10px; width:500px; text-align:center; font-szie:18px;}
-								.box img {width:100%;}
-								</style>
-
-                                <div class="box">
-  									<img src="images/model.PNG" width=500 height=400 alt = "Pic1. Transform Feedback" />
-  										 Pic 1. Instance Drawing
-								</div>
-                                <br><br>
-								<style>
-								.box{top: 10px; width:500px; text-align:center; font-szie:18px;}
-								.box img {width:100%;}
-								</style>
-
-                                <div class="box">
-  									<img src="images/model.PNG" width=500 height=400 alt = "Pic1. Primitive Restart" />
-  										 Pic 1. Primitive Restart
-								</div>
                                 <br><br>
-								<style>
-								.box{top: 10px; width:500px; text-align:center; font-szie:18px;}
-								.box img {width:100%;}
-								</style>
+
+                                <div class="row">
+											<div class="4u 12u(mobile)">
+												<!-- Feature -->
+													<section class="box feature">
+														<a href="images/pic6.jpg" class="image featured"><img src="images/pic2.jpg" width=270 heght = 200></a>
+														Transformation Feedback
+													</section>
+											</div>
+											<div class="4u 12u(mobile)">
+
+												<!-- Feature -->
+													<section class="box feature">
+														<a href="images/pic2.jpg" class="image featured"><img src="images/pic2.jpg" width=270 heght = 20></a>
+														Instance Drawing
+													</section>
+
+											</div>
+											<div class="4u 12u(mobile)">
+
+												<!-- Feature -->
+													<section class="box feature">
+														<a href="images/pic2.jpg" class="image featured"><img src="images/pic2.jpg" width=270 heght = 20></a>
+														Primitive Restart
+													</section>
+											</div>
+										</div>
 
 							</section>