lib/octopress-ink/plugins.rb in octopress-ink-1.0.0.rc.11 vs lib/octopress-ink/plugins.rb in octopress-ink-1.0.0.rc.13

- old
+ new

@@ -126,42 +126,42 @@ end # Read plugin dir from site configs # def self.custom_dir - Ink.site.config['plugins'] + Octopress.site.config['plugins'] end # Copy/Generate Stylesheets # def self.add_stylesheets - if Ink.config['combine_css'] + if Octopress.config['combine_css'] PluginAssetPipeline.write_combined_stylesheet else add_assets(%w{css sass}) end end # Copy/Generate Javascripts # def self.add_javascripts - if Ink.config['combine_js'] + if Octopress.config['combine_js'] PluginAssetPipeline.write_combined_javascript else add_assets(%w{js coffee}) end end def self.css_tags - if Ink.config['combine_css'] + if Octopress.config['combine_css'] PluginAssetPipeline.combined_stylesheet_tag else @css_tags.join('') end end def self.js_tags - if Ink.config['combine_js'] + if Octopress.config['combine_js'] PluginAssetPipeline.combined_javascript_tag else @js_tags.join('') end end