moparisthebest/android.moparisthebest.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/android.moparisthebest.org synced 2024-11-16 06:05:00 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 2.1

Browse Source 
Conflicts:
	plugins/code_block.rb
	plugins/pullquote.rb
This commit is contained in:
Brandon Mathis 2012-06-03 09:52:10 -05:00
commit d4649f7f8f
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/pullquote.rb
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 \"}"