new middleman

1 files changed, 21 insertions, 68 deletions

diff --git a/config.rb b/config.rb
index 27c417d..ea41f39 100644
--- a/config.rb
+++ b/config.rb
@@ -1,43 +1,10 @@
 # encoding: utf-8
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
-
-Time.zone = "Kyiv"
-###
-# Blog settings
-###
-
-###
-# Compass
-###
-
-# Change Compass configuration
-# compass_config do |config|
-#   config.output_style = :compact
-# end
-
-###
-# Page options, layouts, aliases and proxies
 ###
 
-page "/manifest.appcache", proxy: "/pages/manifest.appcache", layout: false
-
-# Per-page layout changes:
-#
-# With no layout
-# page "/path/to/file.html", :layout => false
-#
-# With alternative layout
-# page "/path/to/file.html", :layout => :otherlayout
-#
-# A path which all have the same layout
-# with_layout :admin do
-#   page "/admin/*"
-# end
-
-# Proxy pages (http://middlemanapp.com/basics/dynamic-pages/)
-# proxy "/this-page-has-no-template.html", "/template-file.html", :locals => {
-#  :which_fake_page => "Rendering a fake page with a local variable" }
+proxy "/manifest.appcache", "/pages/manifest.appcache", layout: false
+ignore "/pages/manifest.appcache"
 
 ###
 # Helpers
@@ -51,19 +18,6 @@ helpers do
   end
 end
 
-# Automatic image dimensions on image_tag helper
-# activate :automatic_image_sizes
-
-# Reload the browser automatically whenever files change
-# activate :livereload
-
-# Methods defined in the helpers block are available in templates
-# helpers do
-#   def some_helper
-#     "Helping"
-#   end
-# end
-
 set :css_dir, 'stylesheets'
 set :js_dir, 'javascripts'
 set :images_dir, 'images'
@@ -71,32 +25,31 @@ set :markdown_engine, :kramdown
 set :markdown, filter_html: false, fenced_code_blocks: true, smartypants: true
 set :encoding, 'utf-8'
 
+activate :sprockets do |c|
+  c.expose_middleman_helpers = true
+end
+
+if defined?(RailsAssets)
+  RailsAssets.load_paths.each do |path|
+    sprockets.append_path path
+  end
+end
+
+activate :autoprefixer do |config|
+  config.browsers = ['last 2 versions']
+end
+
 # Build-specific configuration
 configure :build do
   # For example, change the Compass output style for deployment
-  activate :minify_css
-
+  #activate :minify_css
   # Minify Javascript on build
-  activate :minify_javascript
-
-  # Enable cache buster
-  # activate :cache_buster
-
-  # Use relative URLs
-  # activate :relative_assets
-
-  # Compress PNGs after build
-  # First: gem install middleman-smusher
-  #require "middleman-smusher"
-  #activate :smusher
-
-  # Or use a different image path
-  # set :http_path, "/Content/images/"
-  #
+  #activate :minify_javascript
+  # asset hash
   activate :asset_hash
   # min html
   activate :minify_html
-
+  # favicons
   activate :favicon_maker do |f|
     f.template_dir  = File.join(root, 'source/images/favicons')
     f.output_dir    = File.join(root, 'build/images/favicons')
@@ -121,7 +74,7 @@ end
 
 # deploy
 activate :deploy do |deploy|
-  deploy.method = :git
+  deploy.deploy_method = :git
   deploy.branch = "gh-pages"
   deploy.clean = true
 end
\ No newline at end of file