Merge branch 'master' of github.com:imathis/octopress into site

This commit is contained in:
Brandon Mathis 2012-03-07 22:45:39 -06:00
commit 14a8bc05b3
3 changed files with 117 additions and 117 deletions

View File

@ -1,11 +1,11 @@
{% if site.github_user %} {% if site.github_user %}
<section> <section>
<h1>Github Repos</h1> <h1>GitHub Repos</h1>
<ul id="gh_repos"> <ul id="gh_repos">
<li class="loading">Status updating...</li> <li class="loading">Status updating...</li>
</ul> </ul>
{% if site.github_show_profile_link %} {% if site.github_show_profile_link %}
<a href="https://github.com/{{site.github_user}}">@{{site.github_user}}</a> on Github <a href="https://github.com/{{site.github_user}}">@{{site.github_user}}</a> on GitHub
{% endif %} {% endif %}
<script type="text/javascript"> <script type="text/javascript">
$.domReady(function(){ $.domReady(function(){

View File

@ -20,7 +20,7 @@ single: true
<a class="basic-alignment left" href="{{page.previous.url}}" title="Previous Post: {{page.previous.title}}">&laquo; {{page.previous.title}}</a> <a class="basic-alignment left" href="{{page.previous.url}}" title="Previous Post: {{page.previous.title}}">&laquo; {{page.previous.title}}</a>
{% endif %} {% endif %}
{% if page.next.url %} {% if page.next.url %}
<a class="basic-alignment right" href="{{page.next.url}}" title="next Post: {{page.next.title}}">{{page.next.title}} &raquo;</a> <a class="basic-alignment right" href="{{page.next.url}}" title="Next Post: {{page.next.title}}">{{page.next.title}} &raquo;</a>
{% endif %} {% endif %}
</p> </p>
</footer> </footer>