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>

View File

@ -1,115 +1,115 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<skin version="1.1" name="Glow" author="LongTail Video"> <skin version="1.1" name="Glow" author="LongTail Video">
<settings> <settings>
<setting name="backcolor" value="0x000000" /> <setting name="backcolor" value="0x000000" />
<setting name="frontcolor" value="0xeeeeee" /> <setting name="frontcolor" value="0xeeeeee" />
<setting name="lightcolor" value="0xeeeeee" /> <setting name="lightcolor" value="0xeeeeee" />
<setting name="screencolor" value="0x000000" /> <setting name="screencolor" value="0x000000" />
</settings> </settings>
<components> <components>
<component name="controlbar"> <component name="controlbar">
<settings> <settings>
<setting name="margin" value="0" /> <setting name="margin" value="0" />
<setting name="fontsize" value="11" /> <setting name="fontsize" value="11" />
<setting name="fontcolor" value="0xEEEEEE" /> <setting name="fontcolor" value="0xEEEEEE" />
<setting name="buttoncolor" value="0xEEEEEE" /> <setting name="buttoncolor" value="0xEEEEEE" />
</settings> </settings>
<layout> <layout>
<group position="left"> <group position="left">
<button name="play" /> <button name="play" />
<text name="elapsed" /> <text name="elapsed" />
</group> </group>
<group position="center"> <group position="center">
<slider name="time" /> <slider name="time" />
</group> </group>
<group position="right"> <group position="right">
<text name="duration" /> <text name="duration" />
<button name="blank" /> <button name="blank" />
<button name="mute" /> <button name="mute" />
<button name="fullscreen" /> <button name="fullscreen" />
</group> </group>
</layout> </layout>
<elements> <elements>
<element name="background" src="background.png" /> <element name="background" src="background.png" />
<element name="capLeft" src="divider.png" /> <element name="capLeft" src="divider.png" />
<element name="capRight" src="divider.png" /> <element name="capRight" src="divider.png" />
<element name="divider" src="divider.png" /> <element name="divider" src="divider.png" />
<element name="blankButton" src="blankButton.png" /> <element name="blankButton" src="blankButton.png" />
<element name="fullscreenButton" src="fullscreenButton.png" /> <element name="fullscreenButton" src="fullscreenButton.png" />
<element name="fullscreenButtonOver" src="fullscreenButtonOver.png" /> <element name="fullscreenButtonOver" src="fullscreenButtonOver.png" />
<element name="muteButton" src="muteButton.png" /> <element name="muteButton" src="muteButton.png" />
<element name="muteButtonOver" src="muteButtonOver.png" /> <element name="muteButtonOver" src="muteButtonOver.png" />
<element name="pauseButton" src="pauseButton.png" /> <element name="pauseButton" src="pauseButton.png" />
<element name="pauseButtonOver" src="pauseButtonOver.png" /> <element name="pauseButtonOver" src="pauseButtonOver.png" />
<element name="playButton" src="playButton.png" /> <element name="playButton" src="playButton.png" />
<element name="playButtonOver" src="playButtonOver.png" /> <element name="playButtonOver" src="playButtonOver.png" />
<element name="timeSliderBuffer" src="timeSliderBuffer.png" /> <element name="timeSliderBuffer" src="timeSliderBuffer.png" />
<element name="timeSliderCapLeft" src="timeSliderCapLeft.png" /> <element name="timeSliderCapLeft" src="timeSliderCapLeft.png" />
<element name="timeSliderCapRight" src="timeSliderCapRight.png" /> <element name="timeSliderCapRight" src="timeSliderCapRight.png" />
<element name="timeSliderProgress" src="timeSliderProgress.png" /> <element name="timeSliderProgress" src="timeSliderProgress.png" />
<element name="timeSliderRail" src="timeSliderRail.png" /> <element name="timeSliderRail" src="timeSliderRail.png" />
<element name="normalscreenButton" src="normalscreenButton.png" /> <element name="normalscreenButton" src="normalscreenButton.png" />
<element name="normalscreenButtonOver" src="normalscreenButtonOver.png" /> <element name="normalscreenButtonOver" src="normalscreenButtonOver.png" />
<element name="unmuteButton" src="unmuteButton.png" /> <element name="unmuteButton" src="unmuteButton.png" />
<element name="unmuteButtonOver" src="unmuteButtonOver.png" /> <element name="unmuteButtonOver" src="unmuteButtonOver.png" />
<element name="volumeSliderRail" src="divider.png" /> <element name="volumeSliderRail" src="divider.png" />
<element name="volumeSliderProgress" src="divider.png" /> <element name="volumeSliderProgress" src="divider.png" />
</elements> </elements>
</component> </component>
<component name="display"> <component name="display">
<settings> <settings>
<setting name="bufferinterval" value="250" /> <setting name="bufferinterval" value="250" />
<setting name="bufferrotation" value="90" /> <setting name="bufferrotation" value="90" />
</settings> </settings>
<elements> <elements>
<element name="background" src="background.png" /> <element name="background" src="background.png" />
<element name="playIcon" src="playIcon.png" /> <element name="playIcon" src="playIcon.png" />
<element name="muteIcon" src="muteIcon.png" /> <element name="muteIcon" src="muteIcon.png" />
<element name="errorIcon" src="bufferIcon.png" /> <element name="errorIcon" src="bufferIcon.png" />
<element name="bufferIcon" src="bufferIcon.png" /> <element name="bufferIcon" src="bufferIcon.png" />
</elements> </elements>
</component> </component>
<component name="dock"> <component name="dock">
<settings> <settings>
<setting name="fontcolor" value="0xFFFFFF" /> <setting name="fontcolor" value="0xFFFFFF" />
</settings> </settings>
<elements> <elements>
<element name="button" src="button.png" /> <element name="button" src="button.png" />
</elements> </elements>
</component> </component>
<component name="playlist"> <component name="playlist">
<settings> <settings>
<setting name="fontcolor" value="0xEEEEEE" /> <setting name="fontcolor" value="0xEEEEEE" />
<setting name="overcolor" value="0xFFFFFF" /> <setting name="overcolor" value="0xFFFFFF" />
<setting name="activecolor" value="0xFFFFFF" /> <setting name="activecolor" value="0xFFFFFF" />
<setting name="backgroundcolor" value="0x333333" /> <setting name="backgroundcolor" value="0x333333" />
</settings> </settings>
<elements> <elements>
<element name="item" src="item.png" /> <element name="item" src="item.png" />
<element name="itemOver" src="itemOver.png" /> <element name="itemOver" src="itemOver.png" />
<element name="sliderCapBottom" src="sliderCapBottom.png" /> <element name="sliderCapBottom" src="sliderCapBottom.png" />
<element name="sliderCapTop" src="sliderCapTop.png" /> <element name="sliderCapTop" src="sliderCapTop.png" />
<element name="sliderRail" src="sliderRail.png" /> <element name="sliderRail" src="sliderRail.png" />
<element name="sliderThumb" src="sliderThumb.png" /> <element name="sliderThumb" src="sliderThumb.png" />
</elements> </elements>
</component> </component>
<component name="sharing"> <component name="sharing">
<elements> <elements>
<element name="embedIcon" src="embedIcon.png" /> <element name="embedIcon" src="embedIcon.png" />
<element name="embedScreen" src="embedScreen.png" /> <element name="embedScreen" src="embedScreen.png" />
<element name="shareIcon" src="shareIcon.png" /> <element name="shareIcon" src="shareIcon.png" />
<element name="shareScreen" src="shareScreen.png" /> <element name="shareScreen" src="shareScreen.png" />
</elements> </elements>
</component> </component>
</components> </components>
</skin> </skin>