Switch to icons and update copyright date

jwang · Mar 17, 2012 · c7bdbea · c7bdbea
1 parent ae9f747
commit c7bdbea
Show file tree

Hide file tree

Showing 14 changed files with 1,223 additions and 59 deletions.
diff --git a/_includes/footer_nav.html b/_includes/footer_nav.html
@@ -1,43 +1,43 @@
 <footer>
     <nav>
-        <ul class="containsGrid G6 GS" id="footerOne">
+        <!-- <ul class="containsGrid G6 GS" id="footerOne">
-            <li class="G2 GS">
+                    <li class="G2 GS">
-                <h2 class="implied"></h2>
+                        <h2 class="implied"></h2>
-				&nbsp;
+                &nbsp;
-            </li>
+                    </li>
-            <li class="G1">
+                    <li class="G1">
-                <h2 class="HSC"></h2>
+                        <h2 class="HSC"></h2>
-                <ul>
+                        <ul>
-                    <li> </li>
+                            <li> </li>
-                    <li> </li>
+                            <li> </li>
-                    <li> </li>
+                            <li> </li>
-                </ul>
+                        </ul>
-            </li>
+                    </li>
-            <li class="G1">
+                    <li class="G1">
-                <h2 class="HSC"></h2>
+                        <h2 class="HSC"></h2>
-                <ul>
+                        <ul>
-                    <li> </li>
+                            <li> </li>
-                    <li> </li>
+                            <li> </li>
-                    <li> </li>
+                            <li> </li>
-                </ul>
+                        </ul>
-            </li>
+                    </li>
-            <li class="G1">
+                    <li class="G1">
-                <h2 class="HSC"></h2>
+                        <h2 class="HSC"></h2>
-                <ul>
+                        <ul>
-                    <li><a href="http://github.com/jwang">GitHub</a></li>
+                            <li><a href="http://github.com/jwang">GitHub</a></li>
-                    <li><a href="http://linkedin.com/in/johntwang">LinkedIn</a></li>
+                            <li><a href="http://linkedin.com/in/johntwang">LinkedIn</a></li>
-                    <li><a href="http://code.google.com/u/jwang392/">Google Code</a></li>
+                            <li><a href="http://code.google.com/u/jwang392/">Google Code</a></li>
-                </ul>
+                        </ul>
-            </li>
+                    </li>
-            <li class="G1">
+                    <li class="G1">
-                <h2 class="HSC"></h2>
+                        <h2 class="HSC"></h2>
-                <ul>
+                        <ul>
-                    <li><a href="http://facebook.com/johntwang">Facebook</a></li>
+                            <li><a href="http://facebook.com/johntwang">Facebook</a></li>
-                    <li><a href="http://twitter.com/johntwang">Twitter</a></li>
+                            <li><a href="http://twitter.com/johntwang">Twitter</a></li>
-                    <li><a rel="author" href="https://plus.google.com/108799089017956718581">Google +</a></li>
+                            <li><a rel="author" href="https://plus.google.com/108799089017956718581">Google +</a></li>
-                </ul>
+                        </ul>
-            </li>
+                    </li>
-        </ul><!-- .containsGrid.G6GS#footerOne -->
+                </ul> --><!-- .containsGrid.G6GS#footerOne -->
 
         <ul class="G6 GS" id="footerTwo">
             <li><a href="{{ site.url }}">Home</a></li>

diff --git a/_includes/header_nav.html b/_includes/header_nav.html
@@ -2,6 +2,7 @@
     <h1 class="G2 GS">
         <p><a class="G1 GS" rel="author" href="http://johntwang.com" style="
             font-size: 40px;">John T Wang</a></p>
+            {% include social.html %}
     </h1><!-- .G2.GS -->
     <nav>
         <ul class="containsGrid G3" id="headerOne">

diff --git a/_includes/social.html b/_includes/social.html
@@ -0,0 +1,10 @@
+<section id='social'>
+  <a href='http://twitter.com/johntwang'><img src='/images/twitter-2.png' /></a>
+  <a href='https://profiles.google.com/108799089017956718581'><img src='/images/google-plus-black.png' /></a>
+  <a href='http://www.linkedin.com/in/johntwang'><img src='/images/linkedin.png' /></a>
+  <a href='http://github.com/jwang'><img src='/images/github.png' /></a>
+  <a href='http://dribbble.com/johntwang'><img src='/images/dribbble.png' /></a>
+  <a href='http://stackoverflow.com/users/103215/john-wang'><img src='/images/stackoverflow.png' /></a>
+  <a href='http://facebook.com/johntwang'><img src='/images/facebook.png' /></a>
+  <a href='http://www.flickr.com/photos/johntwang/'><img src='/images/flickr.png' /></a>
+</section>
diff --git a/_layouts/contact.html b/_layouts/contact.html
@@ -4,35 +4,35 @@
     <div id="screen">
         {% include header_nav.html %}
 
-        <section class="G2 GS">        	
+        <section class="G2 GS">
-        		<div>
+            <div>
-					<p></p>
+              <p></p>
-					<p></p>
+              <p></p>
-            		<h1 class="HSC">Contact Info</h1>
+                <h1 class="HSC">Contact Info</h1>
-                	<dl class="containsAddress">
+                  <dl class="containsAddress">
-	                    <dt>Mail:</dt>
+                      <dt><img src='/images/social-email.png' /></dt>
-	                    <dd class="email"><a href="mailto:&#106;&#111;&#104;&#110;&#064;&#106;&#111;&#104;&#110;&#116;&#119;&#097;&#110;&#103;&#046;&#099;&#111;&#109;">&#106;&#111;&#104;&#110;&#064;&#106;&#111;&#104;&#110;&#116;&#119;&#097;&#110;&#103;&#046;&#099;&#111;&#109;</a></dd>
+                      <dd class="email"><a href="mailto:&#106;&#111;&#104;&#110;&#064;&#106;&#111;&#104;&#110;&#116;&#119;&#097;&#110;&#103;&#046;&#099;&#111;&#109;">&#106;&#111;&#104;&#110;&#064;&#106;&#111;&#104;&#110;&#116;&#119;&#097;&#110;&#103;&#046;&#099;&#111;&#109;</a></dd>
-	                    <dt>Twitter:</dt>
+                      <dt><img src='/images/twitter-2.png' /></dt>
-	                    <dd class="twitter"><a class="twooser" href="http://twitter.com/johntwang">@johntwang</a></dd>
+                      <dd class="twitter"><a class="twooser" href="http://twitter.com/johntwang">@johntwang</a></dd>
-	                    <dt>LinkedIn:</dt>
+                      <dt><img src='/images/linkedin.png' /></dt>
-	                    <dd class="linkedin"><a href="http://www.linkedin.com/in/johntwang">John Wang</a></dd>
+                      <dd class="linkedin"><a href="http://www.linkedin.com/in/johntwang">John Wang</a></dd>
-						<dt>GitHub:</dt>
+                      <dt><img src='/images/github.png' /></dt>
-	                    <dd class="github"><a href="http://github.com/jwang">jwang</a></dd>
+                      <dd class="github"><a href="http://github.com/jwang">jwang</a></dd>
-	                </dl>
+                  </dl>
-	                <a rel="me" href="https://profiles.google.com/108799089017956718581">
+                  <a rel="me" href="https://profiles.google.com/108799089017956718581">
                     <img src="http://www.google.com/images/icons/ui/gprofile_button-32.png">
                   </a>
-        			</div>
+              </div>
-        	</section><!-- .ia.ia-2.ia-s -->
+          </section><!-- .ia.ia-2.ia-s -->
 
 
-        <article class="G4 GR" id="content">            
+        <article class="G4 GR" id="content">
             <header>
 
             </header>
             <div class="formatted">
                 {{ content }}
-            </div><!-- .formatted -->            
+            </div><!-- .formatted -->
         </article><!-- #content.G4.GR.GS -->
         <hr class="implied" />
 

diff --git a/css/style.css b/css/style.css
diff --git a/images/dribbble.png b/images/dribbble.png
diff --git a/images/facebook.png b/images/facebook.png
diff --git a/images/flickr.png b/images/flickr.png
diff --git a/images/github.png b/images/github.png
diff --git a/images/google-plus-black.png b/images/google-plus-black.png
diff --git a/images/linkedin.png b/images/linkedin.png
diff --git a/images/social-email.png b/images/social-email.png
diff --git a/images/stackoverflow.png b/images/stackoverflow.png
diff --git a/images/twitter-2.png b/images/twitter-2.png