diff options
| author | Parker Moore <parkrmoore@gmail.com> | 2013-11-17 22:47:27 -0500 |
|---|---|---|
| committer | Parker Moore <parkrmoore@gmail.com> | 2013-11-17 22:47:27 -0500 |
| commit | 1230e018843ec3bcb17dc4297f2b0f47693a7608 (patch) | |
| tree | 64d9578e934d058dd0bcd1da380ae6379fe187f2 /plugins | |
| parent | 7f26224bb84e5fef01c4a55effd22fc2b7f1e9c4 (diff) | |
| parent | d577da7c0af912cec131fa76ea5f265388aae5eb (diff) | |
| download | my_new_personal_website-1230e018843ec3bcb17dc4297f2b0f47693a7608.tar.xz my_new_personal_website-1230e018843ec3bcb17dc4297f2b0f47693a7608.zip | |
Merge branch 'master' of github.com:imathis/octopress
* 'master' of github.com:imathis/octopress:
removing border from iframe in jsFiddle plugin
* properly escaped site title and post/page title in the RSS feeds;
* consistently convert page and post titles to titlecase if site.titlecase is true;
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/jsfiddle.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/jsfiddle.rb b/plugins/jsfiddle.rb index 0046f9b5..815910e2 100644 --- a/plugins/jsfiddle.rb +++ b/plugins/jsfiddle.rb @@ -29,7 +29,7 @@ module Jekyll def render(context) if @fiddle - "<iframe style=\"width: #{@width}; height: #{@height}\" src=\"http://jsfiddle.net/#{@fiddle}/embedded/#{@sequence}/#{@skin}/\"></iframe>" + "<iframe style=\"width: #{@width}; height: #{@height}\" frameborder=\"0\" seamless=\"seamless\" src=\"http://jsfiddle.net/#{@fiddle}/embedded/#{@sequence}/#{@skin}/\"></iframe>" else "Error processing input, expected syntax: {% jsfiddle shorttag [tabs] [skin] [height] [width] %}" end |