diff options
| -rw-r--r-- | .themes/classic/sass/base/_theme.scss | 2 | ||||
| -rw-r--r-- | .themes/classic/source/_includes/head.html | 2 | ||||
| -rw-r--r-- | README.markdown | 2 | ||||
| -rw-r--r-- | Rakefile | 4 | ||||
| -rw-r--r-- | plugins/jsfiddle.rb | 2 |
5 files changed, 6 insertions, 6 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/head.html b/.themes/classic/source/_includes/head.html index abbe759d..6b5412ca 100644 --- a/.themes/classic/source/_includes/head.html +++ b/.themes/classic/source/_includes/head.html @@ -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/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/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 |