diff options
| -rw-r--r-- | .themes/classic/sass/base/_theme.scss | 2 | ||||
| -rw-r--r-- | .themes/classic/source/_includes/archive_post.html | 2 | ||||
| -rw-r--r-- | .themes/classic/source/_includes/custom/category_feed.xml | 4 | ||||
| -rw-r--r-- | .themes/classic/source/_includes/head.html | 4 | ||||
| -rw-r--r-- | .themes/classic/source/atom.xml | 4 | ||||
| -rw-r--r-- | README.markdown | 2 | ||||
| -rw-r--r-- | Rakefile | 4 | ||||
| -rw-r--r-- | plugins/category_generator.rb | 3 | ||||
| -rw-r--r-- | plugins/gist_tag.rb | 8 | ||||
| -rw-r--r-- | plugins/jsfiddle.rb | 2 |
10 files changed, 19 insertions, 16 deletions
diff --git a/.themes/classic/sass/base/_theme.scss b/.themes/classic/sass/base/_theme.scss index 20dcd24e..c35136d5 100644 --- a/.themes/classic/sass/base/_theme.scss +++ b/.themes/classic/sass/base/_theme.scss @@ -36,7 +36,7 @@ $nav-border-right: lighten($nav-bg, 7) !default; /* Sidebar colors */ $sidebar-bg: #f2f2f2 !default; -$sidebar-link-color: $link-color !default; +$sidebar-link-color: $text-color !default; $sidebar-link-color-hover: $link-color-hover !default; $sidebar-link-color-active: $link-color-active !default; $sidebar-color: change-color(mix($text-color, $sidebar-bg, 80), $hue: hue($sidebar-bg), $saturation: saturation($sidebar-bg)/2) !default; diff --git a/.themes/classic/source/_includes/archive_post.html b/.themes/classic/source/_includes/archive_post.html index fef3328e..210dbbbe 100644 --- a/.themes/classic/source/_includes/archive_post.html +++ b/.themes/classic/source/_includes/archive_post.html @@ -1,5 +1,5 @@ {% capture category %}{{ post.categories | size }}{% endcapture %} -<h1><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1> +<h1><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1> <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> diff --git a/.themes/classic/source/_includes/custom/category_feed.xml b/.themes/classic/source/_includes/custom/category_feed.xml index f47c5536..2f16eeea 100644 --- a/.themes/classic/source/_includes/custom/category_feed.xml +++ b/.themes/classic/source/_includes/custom/category_feed.xml @@ -4,7 +4,7 @@ layout: nil <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> - <title><![CDATA[{{ page.title }} | {{ site.title }}]]></title> + <title><![CDATA[{% if site.titlecase %}{{ page.title | titlecase | cdata_escape }}{% else %}{{ page.title | cdata_escape }}{% endif %} | {{ site.title | cdata_escape }}]]></title> <link href="{{ site.url }}/{{ page.feed_url }}" rel="self"/> <link href="{{ site.url }}/"/> <updated>{{ site.time | date_to_xmlschema }}</updated> @@ -17,7 +17,7 @@ layout: nil {% for post in site.categories[page.category] limit: 5 %} <entry> - <title type="html"><![CDATA[{{ post.title | cdata_escape }}]]></title> + <title type="html"><![CDATA[{% if site.titlecase %}{{ post.title | titlecase | cdata_escape }}{% else %}{{ post.title | cdata_escape }}{% endif %}]]></title> <link href="{{ site.url }}{{ post.url }}"/> <updated>{{ post.date | date_to_xmlschema }}</updated> <id>{{ site.url }}{{ post.id }}</id> diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html index 7a727b27..6b5412ca 100644 --- a/.themes/classic/source/_includes/head.html +++ b/.themes/classic/source/_includes/head.html @@ -4,7 +4,7 @@ <!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]--> <head> <meta charset="utf-8"> - <title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title> + <title>{% if page.title %}{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %} - {% endif %}{{ site.title }}</title> <meta name="author" content="{{ site.author }}"> {% capture description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %} @@ -23,7 +23,7 @@ <link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"> <script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script> - <script>!window.jQuery && document.write(unescape('%3Cscript src="./javascripts/lib/jquery.min.js"%3E%3C/script%3E'))</script> + <script>!window.jQuery && document.write(unescape('%3Cscript src="./javascripts/libs/jquery.min.js"%3E%3C/script%3E'))</script> <script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script> {% include custom/head.html %} {% include google_analytics.html %} diff --git a/.themes/classic/source/atom.xml b/.themes/classic/source/atom.xml index 83af3f81..d4a44278 100644 --- a/.themes/classic/source/atom.xml +++ b/.themes/classic/source/atom.xml @@ -4,7 +4,7 @@ layout: nil <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> - <title><![CDATA[{{ site.title }}]]></title> + <title><![CDATA[{{ site.title | cdata_escape }}]]></title> <link href="{{ site.url }}/atom.xml" rel="self"/> <link href="{{ site.url }}/"/> <updated>{{ site.time | date_to_xmlschema }}</updated> @@ -17,7 +17,7 @@ layout: nil {% for post in site.posts limit: 20 %} <entry> - <title type="html"><![CDATA[{{ post.title | cdata_escape }}]]></title> + <title type="html"><![CDATA[{% if site.titlecase %}{{ post.title | titlecase | cdata_escape }}{% else %}{{ post.title | cdata_escape }}{% endif %}]]></title> <link href="{{ site.url }}{{ post.url }}"/> <updated>{{ post.date | date_to_xmlschema }}</updated> <id>{{ site.url }}{{ post.id }}</id> diff --git a/README.markdown b/README.markdown index eea8624e..71370a7a 100644 --- a/README.markdown +++ b/README.markdown @@ -19,7 +19,7 @@ Check out [Octopress.org](http://octopress.org/docs) for guides and documentatio [](https://travis-ci.org/imathis/octopress) -We love to see people contributing to Octopress, whether it's a bug report, feature suggestion or a pull request. At the moment, we try to keep the core slick and lean, focusing on basic blogging needs, so some of your suggestions might not find their way into Octopress. For those ideas, we started a [list of 3rd party plug-ins](https://github.com/imathis/octopress/wiki/3rd-party-plugins), where you can link your own Octopress plug-in repositories. For the future, we're thinking about ways to easier add them them into our main releases. +We love to see people contributing to Octopress, whether it's a bug report, feature suggestion or a pull request. At the moment, we try to keep the core slick and lean, focusing on basic blogging needs, so some of your suggestions might not find their way into Octopress. For those ideas, we started a [list of 3rd party plug-ins](https://github.com/imathis/octopress/wiki/3rd-party-plugins), where you can link your own Octopress plug-in repositories. For the future, we're thinking about ways to easier add them into our main releases. ## License @@ -108,7 +108,7 @@ task :new_post, :title do |t, args| post.puts "---" post.puts "layout: post" post.puts "title: \"#{title.gsub(/&/,'&')}\"" - post.puts "date: #{Time.now.strftime('%Y-%m-%d %H:%M')}" + post.puts "date: #{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}" post.puts "comments: true" post.puts "categories: " post.puts "---" @@ -184,7 +184,7 @@ task :update_style, :theme do |t, args| mv "sass", "sass.old" puts "## Moved styles into sass.old/" cp_r "#{themes_dir}/"+theme+"/sass/", "sass" - cp_r "sass.old/custom/.", "sass/custom" + cp_r "sass/custom/.", "sass.old/custom" puts "## Updated Sass ##" end diff --git a/plugins/category_generator.rb b/plugins/category_generator.rb index a49c4296..c55d62f4 100644 --- a/plugins/category_generator.rb +++ b/plugins/category_generator.rb @@ -119,7 +119,7 @@ module Jekyll =============================================== Error for category_generator.rb plugin ----------------------------------------------- - No 'category_index.hmtl' in source/_layouts/ + No 'category_index.html' in source/_layouts/ Perhaps you haven't installed a theme yet. =============================================== @@ -191,4 +191,3 @@ ERR end end - diff --git a/plugins/gist_tag.rb b/plugins/gist_tag.rb index 0828d270..9bdd14dc 100644 --- a/plugins/gist_tag.rb +++ b/plugins/gist_tag.rb @@ -23,11 +23,15 @@ module Jekyll def render(context) if parts = @text.match(/([a-zA-Z\d]*) (.*)/) gist, file = parts[1].strip, parts[2].strip + else + gist, file = @text.strip, "" + end + if gist.empty? + "" + else script_url = script_url_for gist, file code = get_cached_gist(gist, file) || get_gist_from_web(gist, file) html_output_for script_url, code - else - "" end end 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 |