Permalink
Browse files

Fix for issue #113, based heavily on fujii@16e8a9d.

  • Loading branch information...
1 parent c77431d commit 13547e6edfd876cf7dbeff3593b4f85895fe5db9 groundh0g committed Feb 28, 2015
Showing with 8 additions and 10 deletions.
  1. +4 −10 Rakefile
  2. +2 −0 _layouts/page.html
  3. +2 −0 _layouts/post.html
View
@@ -134,16 +134,10 @@ namespace :theme do
puts "Generating '#{theme_name}' layout: #{File.basename(filename)}"
open(File.join(CONFIG['layouts'], File.basename(filename)), 'w') do |page|
- if File.basename(filename, ".html").downcase == "default"
- page.puts "---"
- page.puts File.read(settings_file) if File.exist?(settings_file)
- page.puts "---"
- else
- page.puts "---"
- page.puts "layout: default"
- page.puts "---"
- end
- page.puts "{% include JB/setup %}"
+ page.puts "---"
+ page.puts File.read(settings_file) if File.exist?(settings_file)
+ page.puts "layout: default" unless File.basename(filename, ".html").downcase == "default"
+ page.puts "---" page.puts "{% include JB/setup %}"
page.puts "{% include themes/#{theme_name}/#{File.basename(filename)} %}"
end
end
View
@@ -1,4 +1,6 @@
---
+theme :
+ name : bootstrap-3
layout: default
---
{% include JB/setup %}
View
@@ -1,4 +1,6 @@
---
+theme :
+ name : bootstrap-3
layout: default
---
{% include JB/setup %}

0 comments on commit 13547e6

Please sign in to comment.