updated to latest 2.1

This commit is contained in:
Brandon Mathis 2012-05-19 17:42:27 -05:00
parent bc717eafe2
commit 93c1965844
19 changed files with 357 additions and 267 deletions

View File

@ -1,22 +1,22 @@
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
RedCloth (4.2.8) RedCloth (4.2.9)
albino (1.3.3) albino (1.3.3)
posix-spawn (>= 0.3.6) posix-spawn (>= 0.3.6)
blankslate (2.1.2.4) blankslate (2.1.2.4)
chunky_png (1.2.1) chunky_png (1.2.5)
classifier (1.3.3) classifier (1.3.3)
fast-stemmer (>= 1.0.0) fast-stemmer (>= 1.0.0)
compass (0.11.5) compass (0.12.1)
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) fssm (>= 0.2.7)
sass (~> 3.1) sass (~> 3.1)
directory_watcher (1.4.0) directory_watcher (1.4.1)
fast-stemmer (1.0.0) fast-stemmer (1.0.1)
ffi (1.0.9) ffi (1.0.11)
fssm (0.2.7) fssm (0.2.9)
haml (3.1.2) haml (3.1.6)
jekyll (0.11.0) jekyll (0.11.0)
albino (>= 1.3.2) albino (>= 1.3.2)
classifier (>= 1.3.1) classifier (>= 1.3.1)
@ -24,28 +24,28 @@ GEM
kramdown (>= 0.13.2) kramdown (>= 0.13.2)
liquid (>= 1.9.0) liquid (>= 1.9.0)
maruku (>= 0.5.9) maruku (>= 0.5.9)
kramdown (0.13.3) kramdown (0.13.6)
liquid (2.2.2) liquid (2.2.2)
maruku (0.6.0) maruku (0.6.0)
syntax (>= 1.0.0) syntax (>= 1.0.0)
posix-spawn (0.3.6) posix-spawn (0.3.6)
pygments.rb (0.1.3) pygments.rb (0.2.12)
rubypython (>= 0.5.1) rubypython (~> 0.5.3)
rack (1.3.2) rack (1.4.1)
rake (0.9.2) rake (0.9.2.2)
rb-fsevent (0.4.3.1) rb-fsevent (0.9.1)
rdiscount (1.6.8) rdiscount (1.6.8)
rubypants (0.2.0) rubypants (0.2.0)
rubypython (0.5.1) rubypython (0.5.3)
blankslate (>= 2.1.2.3) blankslate (>= 2.1.2.3)
ffi (~> 1.0.7) ffi (~> 1.0.7)
sass (3.1.18) sass (3.1.18)
sinatra (1.2.6) sinatra (1.2.6)
rack (~> 1.1) rack (~> 1.1)
tilt (>= 1.2.2, < 2.0) tilt (>= 1.2.2, < 2.0)
stringex (1.3.0) stringex (1.4.0)
syntax (1.0.0) syntax (1.0.0)
tilt (1.3.2) tilt (1.3.3)
PLATFORMS PLATFORMS
ruby ruby

View File

@ -127,16 +127,17 @@ body.sidebar-footer {
@media only screen and (min-width: 750px) { @media only screen and (min-width: 750px) {
aside.sidebar { @include collapse-sidebar; } aside.sidebar { @include collapse-sidebar; }
} }
#main, #content, .sidebar {
@extend .group;
}
@media only screen and (min-width: 768px) { @media only screen and (min-width: 768px) {
body { -webkit-text-size-adjust: auto; } body { -webkit-text-size-adjust: auto; }
body > header { font-size: $header-font-size * 1.2; } body > header { font-size: $header-font-size * 1.2; }
#main { #main {
@extend .group;
padding: 0; padding: 0;
margin: 0 auto; margin: 0 auto;
} }
#content { #content {
@extend .group;
overflow: visible; overflow: visible;
margin-right: $sidebar-width-medium; margin-right: $sidebar-width-medium;
position: relative; position: relative;
@ -149,7 +150,6 @@ body.sidebar-footer {
} }
} }
aside.sidebar { aside.sidebar {
@extend .group;
width: $sidebar-width-medium - $sidebar-pad-medium*2; width: $sidebar-width-medium - $sidebar-pad-medium*2;
padding: 0 $sidebar-pad-medium $sidebar-pad-medium; padding: 0 $sidebar-pad-medium $sidebar-pad-medium;
background: none; background: none;
@ -180,7 +180,6 @@ body.sidebar-footer {
padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide; padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide;
.collapse-sidebar & { .collapse-sidebar & {
padding: { left: $pad-wide; right: $pad-wide; } padding: { left: $pad-wide; right: $pad-wide; }
@extend .group;
} }
} }
} }
@ -190,3 +189,4 @@ body.sidebar-footer {
ul, ol { margin-left: 0; } ul, ol { margin-left: 0; }
} }
} }

View File

@ -6,6 +6,13 @@ $heading-font-family: "PT Serif", "Georgia", "Helvetica Neue", Arial, sans-serif
$header-title-font-family: $heading-font-family !default; $header-title-font-family: $heading-font-family !default;
$header-subtitle-font-family: $heading-font-family !default; $header-subtitle-font-family: $heading-font-family !default;
$h1: 2.2em !default;
$h2: 1.5em !default;
$h3: 1.3em !default;
$h4: 1em !default;
$h5: .9em !default;
$h6: .8em !default;
// Fonts // Fonts
.heading { .heading {
font-family: $heading-font-family; font-family: $heading-font-family;
@ -15,7 +22,7 @@ $header-subtitle-font-family: $heading-font-family !default;
.mono { font-family: $mono; } .mono { font-family: $mono; }
body > header h1 { body > header h1 {
font-size: 2.2em; font-size: $h1;
@extend .heading; @extend .heading;
font-family: $header-title-font-family; font-family: $header-title-font-family;
font-weight: normal; font-weight: normal;
@ -31,15 +38,6 @@ body {
color: $text-color; color: $text-color;
@extend .serif; @extend .serif;
} }
h1 {
font-size: 2.2em;
line-height: 1.2em;
}
@media only screen and (min-width: 992px) {
body { font-size: 1.15em; }
h1 { font-size: 2.6em; line-height: 1.2em; }
}
#{headings()}{ #{headings()}{
@extend .heading; @extend .heading;
@ -47,21 +45,30 @@ h1 {
margin-bottom: 1em; margin-bottom: 1em;
font-weight: bold; font-weight: bold;
} }
h1 {
font-size: $h1;
line-height: 1.2em;
}
h2, section h1 { h2, section h1 {
font-size: 1.5em; font-size: $h2;
} }
h3, section h2, section section h1 { h3, section h2, section section h1 {
font-size: 1.3em; font-size: $h3;
} }
h4, section h3, section section h2, section section section h1 { h4, section h3, section section h2, section section section h1 {
font-size: 1em; font-size: $h4;
} }
h5, section h4, section section h3 { h5, section h4, section section h3 {
font-size: .9em; font-size: $h5;
} }
h6, section h5, section section h4, section section section h3 { h6, section h5, section section h4, section section section h3 {
font-size: .8em; font-size: $h6;
} }
@media only screen and (min-width: 992px) {
body { font-size: 1.15em; }
}
p, blockquote, ul, ol { margin-bottom: 1.5em; } p, blockquote, ul, ol { margin-bottom: 1.5em; }
ul { list-style-type: disc; ul { list-style-type: disc;

View File

@ -2,6 +2,7 @@
#content > div { &, > article { padding-top: 0; } } #content > div { &, > article { padding-top: 0; } }
} }
#blog-archives { #blog-archives {
color: $text-color-light;
article { article {
padding: 1em 0 1em; padding: 1em 0 1em;
position: relative; position: relative;
@ -9,25 +10,31 @@
&:last-child { &:last-child {
background: none; background: none;
} }
footer { padding: 0; margin: 0;} footer {
padding: 0; margin: 0;
font-size: .85em;
line-height: 1em;
}
} }
h1 { color: $text-color; margin-bottom: .3em; }
h2 { display: none; } h2 { display: none; }
h1 { .entry-title {
font-size: 1.5em; color: $text-color; margin-bottom: .3em;
font-size: $h3;
a { a {
@include hover-link; @include hover-link;
color: inherit;
&:hover { color: $link-color-hover; } &:hover { color: $link-color-hover; }
font-weight: normal; font-weight: normal;
display: inline-block; display: inline-block;
} }
} }
article[data-linklog] .entry-title {
font-size: $h4;
a { text-decoration: underline; }
}
a.category, time { a.category, time {
@extend .sans; @extend .sans;
color: $text-color-light; color: $text-color-light;
} }
color: $text-color-light;
.entry-content { display: none; } .entry-content { display: none; }
time { time {
font-size: .9em; font-size: .9em;
@ -36,10 +43,13 @@
.month { text-transform: uppercase; } .month { text-transform: uppercase; }
} }
p { margin-bottom: 1em; } p { margin-bottom: 1em; }
&, .entry-content { a { @include link-colors(inherit, $link-color-hover); }}
a:hover { color: $link-color-hover; } a:hover { color: $link-color-hover; }
@media only screen and (min-width: 550px) { @media only screen and (min-width: 550px) {
article { margin-left: 5em; } article {
padding: { left: 4.5em; bottom: .7em;}
margin-left: 5em;
}
h2 { h2 {
margin-bottom: .3em; margin-bottom: .3em;
font-weight: normal; font-weight: normal;
@ -55,12 +65,7 @@
top: 1.8em; top: 1.8em;
} }
.year { display: none; } .year { display: none; }
article { a.category { line-height: 1.1em; }
padding:{left: 4.5em; bottom: .7em;}
}
a.category {
line-height: 1.1em;
}
} }
} }
#content > .category { #content > .category {

View File

@ -1,3 +1,8 @@
#content .blog-index {
padding: { top: 0; bottom: 0; }
article { padding-top: 2em; }
}
article { article {
padding-top: 1em; padding-top: 1em;
a { @extend .force-wrap; } a { @extend .force-wrap; }
@ -7,33 +12,100 @@ article {
padding-bottom: 1em; padding-bottom: 1em;
margin-bottom: 1em; margin-bottom: 1em;
background: $img-border bottom left repeat-x; background: $img-border bottom left repeat-x;
h1 {
margin: 0;
a { text-decoration: none;
&:hover { text-decoration: underline; } }
}
p {
font-size: .9em;
color: $text-color-light;
margin: 0;
&.meta {
@extend .sans;
text-transform: uppercase;
position: absolute; top: 0;
}
}
@media only screen and (min-width: 768px) { @media only screen and (min-width: 768px) {
margin-bottom: 1.5em; margin-bottom: 1.5em;
padding-bottom: 1em; padding-bottom: 1em;
background: $img-border bottom left repeat-x; background: $img-border bottom left repeat-x;
} }
.blog-index & { background: none; padding-bottom: 0; }
p {
font-size: .9em;
margin: 0;
color: $text-color-light;
&.meta { @extend .sans; position: absolute; top: 0; }
}
time { text-transform: uppercase; }
} }
.entry-title {
margin: 0;
a { text-decoration: none;
&:hover { text-decoration: underline; }
}
.blog-index & {
font-size: $h1;
a { color: inherit; &:hover { color: $link-color-hover; } }
}
}
a[rel=bookmark] { text-decoration: none; }
h2 { h2 {
padding-top: 0.8em; padding-top: 0.8em;
background: $img-border top left repeat-x; background: $img-border top left repeat-x;
} }
.entry-content & h2:first-child, header + h2 { padding-top: 0; }
h2:first-child, header + h2 { background: none; } h2:first-child, header + h2 { background: none; }
.entry-content & h2:first-child, header + h2 { padding-top: 0; }
&.linklog {
.entry-title {
font-size: $h1;
a { text-decoration: underline; }
}
.blog-index & .entry-title { font-size: $h2; }
}
.linklog-marker {
color: $text-color-light;
font-size: .8em;
line-height: 1em;
position: relative; top: -.15em;
}
> footer {
@extend .sans;
padding-bottom: 2.5em;
margin-top: 2em;
.blog-index & { margin-top: 1em; }
}
footer {
.meta {
margin-bottom: .8em;
font-size: .85em;
clear: both;
overflow: hidden;
}
.byline + time:before, time +time:before, .comments:before, .byline ~ .categories:before {
@extend .separator;
}
p:last-child { margin-bottom: 0; }
.comments-link {
font-size: .8em;
color: inherit;
&:hover, &:focus { color: $link-color-hover; }
}
}
a[rel=full-article] {
background: darken($main-bg, 5);
display: inline-block;
padding: .4em .8em;
margin-right: .5em;
text-decoration: none;
color: mix($text-color, $text-color-light);
@extend .serif;
@include transition(background-color .5s);
&:hover {
background: $link-color-hover;
text-shadow: none;
color: $main-bg;
}
}
.blog-index & + article {
background: $img-border top left repeat-x;
}
.feature { .feature {
padding-top: .5em; padding-top: .5em;
margin-bottom: 1em; margin-bottom: 1em;
@ -42,6 +114,7 @@ article {
font-size: 2.0em; font-style: italic; font-size: 2.0em; font-style: italic;
line-height: 1.3em; line-height: 1.3em;
} }
img, video, .flash-video { img, video, .flash-video {
@extend .flex-content; @extend .flex-content;
@extend .basic-alignment; @extend .basic-alignment;
@ -66,54 +139,6 @@ article {
} }
} }
} }
> footer {
padding-bottom: 2.5em;
margin-top: 2em;
@extend .sans;
p.meta {
margin-bottom: .8em;
font-size: .85em;
clear: both;
overflow: hidden;
}
.byline + time:before, time +time:before, .comments:before, .byline ~ .categories:before {
@extend .separator;
}
}
}
article + article {
.blog-index & {
background: $img-border top left repeat-x;
}
}
#content .blog-index {
padding: { top: 0; bottom: 0; }
article { padding-top: 2em; }
article header { background: none; padding-bottom: 0; }
article h1 {
font-size: 2.2em;
a { color: inherit; &:hover { color: $link-color-hover; } }
}
a[rel=full-article] {
background: darken($main-bg, 5);
display: inline-block;
padding: .4em .8em;
margin-right: .5em;
text-decoration: none;
color: mix($text-color, $text-color-light);
@extend .serif;
@include transition(background-color .5s);
&:hover {
background: $link-color-hover;
text-shadow: none;
color: $main-bg;
}
}
footer {
@extend .sans;
margin-top: 1em;
}
} }
.separator { .separator {

View File

@ -13,7 +13,7 @@ body > nav {
.search { .search {
padding: .3em .5em 0; padding: .3em .5em 0;
font-size: .85em; font-size: .85em;
@extend .sans; font-family: $sans;
line-height: 1.1em; line-height: 1.1em;
width: 95%; width: 95%;
@include border-radius(.5em); @include border-radius(.5em);
@ -54,7 +54,7 @@ body > nav {
} }
a { a {
@include link-colors($nav-color, $nav-color-hover, $visited: $nav-color); @include link-colors($nav-color, $nav-color-hover, $visited: $nav-color);
@extend .sans; font-family: $sans;
text-shadow: lighten($nav-bg, 12) 0 1px; text-shadow: lighten($nav-bg, 12) 0 1px;
float: left; float: left;
text-decoration: none; text-decoration: none;
@ -134,3 +134,4 @@ body > nav {
a[rel=subscribe-rss]{ @include mask-subscription-nav('rss.png'); } a[rel=subscribe-rss]{ @include mask-subscription-nav('rss.png'); }
a[rel=subscribe-email]{ @include mask-subscription-nav('email.png'); } a[rel=subscribe-email]{ @include mask-subscription-nav('email.png'); }
} }

View File

@ -1,8 +1,12 @@
{% capture category %}{{ post.categories | size }}{% endcapture %} {% capture category %}{{ post.categories | size }}{% endcapture %}
<h1><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1> {% include post/title.html %}
<time datetime="{{ post.date | datetime | date_to_xmlschema }}" pubdate>{{ post.date | date: "<span class='month'>%b</span> <span class='day'>%d</span> <span class='year'>%Y</span>"}}</time> <time datetime="{{ post.date | datetime | date_to_xmlschema }}" pubdate>{{ post.date | date: "<span class='month'>%b</span> <span class='day'>%d</span> <span class='year'>%Y</span>"}}</time>
{% if category != '0' %}
<footer> <footer>
{% if linklog %}
<a rel="bookmark" href="{{ permalink }}">{{ site.permalink_label }}</a>
{% endif %}
{% if category != '0' %}
{% if linklog %} &bull; {% endif %}
<span class="categories">posted in {{ post.categories | category_links }}</span> <span class="categories">posted in {{ post.categories | category_links }}</span>
{% endif %}
</footer> </footer>
{% endif %}

View File

@ -1,28 +1,22 @@
{% unless page.no_header %} {% unless page.no_header %}
<header> <header>
{% if index %} {% include post/title.html %}
<h1 class="entry-title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1>
{% else %}
<h1 class="entry-title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1>
{% endif %}
{% unless page.meta == false %} {% unless page.meta == false %}
<p class="meta"> <p class="meta">
{% include post/date.html %}{{ time }} {% include post/date.html %}{{ time }}
{% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %} &bull; <a rel="bookmark" href="{{ permalink }}">{{ site.permalink_label }}</a>
| <a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">Comments</a>
{% endif %}
</p> </p>
{% endunless %} {% endunless %}
</header> </header>
{% endunless %} {% endunless %}
{% if index %}
<div class="entry-content">{{ content | excerpt }}</div>
{% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
{% if excerpted == 'true' %}
<footer>
<a rel="full-article" href="{{ root_url }}{{ post.url }}">{{ site.excerpt_link }}</a>
</footer>
{% endif %}
{% else %}
<div class="entry-content">{{ content }}</div> <div class="entry-content">{{ content }}</div>
{% if index %}
<footer>
{% if site.disqus_short_name and page.comments != false and site.disqus_show_comment_count == true %}
<p><a class="comments-link" href="{% if index %}{{ permalink }}{% endif %}#disqus_thread">View comments &raquo;</a></p>
{% endif %}
{% if excerpted != 'false' %}
<p><a rel="full-article" href="{{ permalink }}">{{ site.excerpt_link }}</a></p>
{% endif %}
</footer>
{% endif %} {% endif %}

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

@ -0,0 +1,9 @@
{% assign linklog = false %}
{% if post.external-url %}{% capture linklog %}{{ post.external-url | prepend_url: site.url }}{% endcapture %}{% endif %}
{% capture title_url %}{% if linklog %}{{ linklog }}{% else %}{{ site.url }}{{ post.url }}{% endif %}{% endcapture %}
{% capture title %}{% if linklog and site.linklog_marker_position_feed == 'before' %}{% unless linklog %}{{ site.standard_post_marker }}{% endunless %}{{ site.linklog_marker }} {% endif %}{{ post.title }}{% if linklog and site.linklog_marker_position_feed == 'after' %} {{ site.linklog_marker }}{% endif %}{% endcapture %}
{% capture content %}{% if site.excerpt_in_feed %}{{ post.content | excerpt | expand_urls: site.url }}<p><a rel="bookmark" href="{{ site.url }}{{ post.url }}">{{ site.excerpt_link }}</a></p>{% else %}{{ post.content | expand_urls: site.url }}<p><a rel="bookmark" href="{{ site.url }}{{ post.url }}">{{ site.permalink_label_feed }}</a></p>{% endif %}{% endcapture %}
<title type="html"><![CDATA[{{ title | cdata_escape }}]]></title>
<link href="{{ title_url }}"/>
<updated>{{ post.date | date_to_xmlschema }}</updated>
<id>{{ site.url }}{{ post.id }}</id>

View File

@ -0,0 +1,5 @@
<h1 class="entry-title">
{% if linklog and site.linklog_marker and site.linklog_marker_position == 'before' %}{{ linklog_marker }}{% endif %}
{% if index or linklog %}<a href="{{ title_url }}">{% endif %}{% if site.titlecase %}{{ article_title | titlecase }}{% else %}{{ article_title }}{% endif %}{% if index or linklog %}</a>{% endif %}
{% if linklog and site.linklog_marker and site.linklog_marker_position == 'after' %}{{ linklog_marker }}{% endif %}
</h1>

View File

@ -0,0 +1,14 @@
{% assign linklog = false %}
{% assign index = false %}
{% if page.external-url %}
{% capture linklog %}{{ page.external-url }}{% endcapture %}
{% elsif post.external-url %}
{% capture linklog %}{{ post.external-url }}{% endcapture %}
{% endif %}
{% if post.url %}{% assign index = true %}{% endif %}
{% capture permalink %}{{ root_url }}{% if index %}{{ post.url }}{% else %}{{ page.url }}{% endif %}{% endcapture %}
{% capture title_url %}{% if linklog %}{{ linklog }}{% else %}{{ permalink }}{% endif %}{% endcapture %}
{% capture article_title %}{% if index %}{% unless linklog %}{{ site.standard_post_marker }}{% endunless %}{{ post.title }}{% else %}{% unless linklog %}{{ site.standard_post_marker }}{% endunless %}{{ page.title }}{% endif %}{% endcapture %}
{% capture linklog_marker %}<span class='linklog-marker'>{{ site.linklog_marker }}</span>{% endcapture %}
{% capture content %}{% if index %}{% capture excerpted %}{{ post.content | has_excerpt }}{% endcapture %}{% if excerpted != 'false' %}{{ post.content | excerpt }}{% else %}{{ post.content }}{% endif %}{% else %}{{ content }}{% endif %}{% endcapture %}

View File

@ -0,0 +1,25 @@
---
layout: nil
---
<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title><![CDATA[{{ page.title }} | {{ site.title }}]]></title>
<link href="{{ site.url }}/{{ page.feed_url }}" rel="self"/>
<link href="{{ site.url }}/"/>
<updated>{{ site.time | date_to_xmlschema }}</updated>
<id>{{ site.url }}/</id>
<author>
<name><![CDATA[{{ site.author | strip_html }}]]></name>
{% if site.email %}<email><![CDATA[{{ site.email }}]]></email>{% endif %}
</author>
<generator uri="http://octopress.org/">Octopress</generator>
{% for post in site.categories[page.category] limit: 5 %}
<entry>
{% include feed_entry.xml %}
<content type="html"><![CDATA[{{ content | markdownify | cdata_escape }}]]></content>
</entry>
{% endfor %}
</feed>

View File

@ -1,6 +1,7 @@
--- ---
layout: page layout: page
footer: false footer: false
body_id: archive
--- ---
<div id="blog-archives" class="category"> <div id="blog-archives" class="category">
@ -10,7 +11,8 @@ footer: false
{% assign year = this_year %} {% assign year = this_year %}
<h2>{{ year }}</h2> <h2>{{ year }}</h2>
{% endunless %} {% endunless %}
<article> {% include post/variables.html %}
<article {% if linklog %}class='linklog'{% endif %}>
{% include archive_post.html %} {% include archive_post.html %}
</article> </article>
{% endfor %} {% endfor %}

View File

@ -4,7 +4,8 @@ single: true
--- ---
<div> <div>
<article class="hentry" role="article"> {% include post/variables.html %}
<article class="hentry" role="article" {% if linklog %}class="linklog"{% endif %}>
{% include article.html %} {% include article.html %}
<footer> <footer>
<p class="meta"> <p class="meta">
@ -20,7 +21,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>
@ -41,3 +42,4 @@ single: true
{% endif %} {% endif %}
</aside> </aside>
{% endunless %} {% endunless %}

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>

View File

@ -3,7 +3,6 @@ layout: nil
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom"> <feed xmlns="http://www.w3.org/2005/Atom">
<title><![CDATA[{{ site.title }}]]></title> <title><![CDATA[{{ site.title }}]]></title>
<link href="{{ site.url }}/atom.xml" rel="self"/> <link href="{{ site.url }}/atom.xml" rel="self"/>
<link href="{{ site.url }}/"/> <link href="{{ site.url }}/"/>
@ -16,12 +15,9 @@ layout: nil
<generator uri="http://octopress.org/">Octopress</generator> <generator uri="http://octopress.org/">Octopress</generator>
{% for post in site.posts limit: 20 %} {% for post in site.posts limit: 20 %}
<entry> <entry>
<title type="html"><![CDATA[{{ post.title | cdata_escape }}]]></title> {% include feed_entry.xml %}
<link href="{{ site.url }}{{ post.url }}"/> <content type="html"><![CDATA[{{ content | cdata_escape }}]]></content>
<updated>{{ post.date | date_to_xmlschema }}</updated> </entry>
<id>{{ site.url }}{{ post.id }}</id>
<content type="html"><![CDATA[{{ post.content | expand_urls: site.url | cdata_escape }}]]></content>
</entry>
{% endfor %} {% endfor %}
</feed> </feed>

View File

@ -2,6 +2,7 @@
layout: page layout: page
title: Blog Archive title: Blog Archive
footer: false footer: false
body_id: archive
--- ---
<div id="blog-archives"> <div id="blog-archives">
@ -11,7 +12,8 @@ footer: false
{% assign year = this_year %} {% assign year = this_year %}
<h2>{{ year }}</h2> <h2>{{ year }}</h2>
{% endunless %} {% endunless %}
<article> {% include post/variables.html %}
<article {% if linklog %}data-linklog{% endif %}>
{% include archive_post.html %} {% include archive_post.html %}
</article> </article>
{% endfor %} {% endfor %}

View File

@ -3,10 +3,9 @@ layout: default
--- ---
<div class="blog-index"> <div class="blog-index">
{% assign index = true %}
{% for post in paginator.posts %} {% for post in paginator.posts %}
{% assign content = post.content %} {% include post/variables.html %}
<article> <article {% if linklog %}class="linklog"{% endif %}>
{% include article.html %} {% include article.html %}
</article> </article>
{% endfor %} {% endfor %}