Merge branch 'source' of github.com:wona/wona.github.com into source

Conflicts:
	sass/custom/_styles.scss
	source/_includes/custom/navigation.html
This commit is contained in:
wona
2012-10-20 14:55:00 +05:30
4 changed files with 17 additions and 6 deletions

View File

@ -122,3 +122,15 @@ body {
}
}
}
.archives {
.title {
font-size: 1.2em;
}
}
.internship-page {
margin-top: 50px;
margin-bottom: 30px;
}

View File

@ -2,6 +2,6 @@
<li><a href="{{ root_url }}/">Blog</a></li>
<li><a href="{{ root_url }}/blog/archives">Post Index</a></li>
<li><a href="{{ root_url }}/blog/index">Magazine Archives</a></li>
<li><a id="new" href="{{ root_url }}/blog/internship">Internships</a></li>
<li><a href="{{ root_url }}/blog/internship">Internship</a></li>
</ul>

View File

@ -1,4 +1,4 @@
<img src="images/dp.jpg" alt="WatchOut!" style="width: 160px;">
<img src="/images/dp.jpg" alt="WatchOut!" style="width: 160px;">
<h1><a href="{{ root_url }}/">{{ site.title }}</a></h1>
<nav id="main-nav">{% include navigation.html %}</nav>
<br/>

View File

@ -2,8 +2,7 @@
layout: default
title: The Internship Blog
---
<h2>Write to us about your internship experience! Help out the uninitiated!</h2>
<div>
<img src="/images/mail.png" alt=""/>
<div class="internship-page">
<h2>Write to us about your internship experience! Help out the uninitiated!</h2>
<h4><img src="/images/email.png" alt=""/> Mail us at <em>letterstowona@googlegroups.com</em></h4>
</div>
<h4>Mail us at <em>letterstowona@googlegroups.com</em></h4>