Merge from 2.1

This commit is contained in:
Brandon Mathis 2012-06-08 14:29:08 -05:00
parent f4152ad1a7
commit 1f8377f157
3 changed files with 2 additions and 4 deletions

View File

@ -17,7 +17,7 @@
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1">
{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
<link rel="canonical" href="{{ canonical }}">
<link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
<script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>

View File

@ -66,7 +66,7 @@ blog_index_asides: [asides/twitter.html, asides/delicious.html, asides/pinboard.
# 3rd Party Settings #
# ----------------------- #
# Javascript social buttons often generate lots of http requests and may track viewers browsing history
# Javascript social buttons often generate lots of http requests and may track your viewer's browsing history
# Show respect for privacy and bandwidth with simple links for Twitter, Facebook and Google Plus.
respectfully_social: true

View File

@ -33,9 +33,7 @@ module Jekyll
def render(context)
output = super
if output =~ /\{"\s*(.+?)\s*"\}/m
#@quote = $1
@quote = RubyPants.new($1).to_html
#@quote = CGI.escape($1)
"<span class='pullquote-#{@align}' data-pullquote='#{@quote}'>#{output.gsub(/\{"\s*|\s*"\}/, '')}</span>"
else
return "Surround your pullquote like this {\" text to be quoted \"}"