From 0c2be9b7c5abee0934a6333e726d380f0b235447 Mon Sep 17 00:00:00 2001 From: Simon Gate Date: Sun, 2 Dec 2012 10:20:46 +0100 Subject: [PATCH] Fix assets and livereload when deploying --- Gemfile | 2 ++ Gemfile.lock | 2 ++ config.rb | 15 +++++++++------ source/index.html.erb | 2 +- source/layouts/layout.html.erb | 12 +++++------- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 1dd5c8a..5c11c48 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,9 @@ source :rubygems +gem "rake" gem "redcarpet" gem "middleman", "~>3.0.6" gem "middleman-sprockets" + gem "guard-livereload" gem "rack-livereload" diff --git a/Gemfile.lock b/Gemfile.lock index 555bfaf..a313850 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,6 +94,7 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) + rake (10.0.2) rb-fsevent (0.9.2) rb-inotify (0.8.8) ffi (>= 0.5.0) @@ -129,4 +130,5 @@ DEPENDENCIES middleman (~> 3.0.6) middleman-sprockets rack-livereload + rake redcarpet diff --git a/config.rb b/config.rb index eb566ea..0c8e4bb 100644 --- a/config.rb +++ b/config.rb @@ -1,6 +1,3 @@ -require "rack/livereload" - -use Rack::LiveReload ### # Compass @@ -110,7 +107,7 @@ def stipendiat_year_tag(year) set :js_assets_paths, ["#{root}/components/", "#{root}/source/js/"] -set :images_dir, 'img' +set :images_dir, 'images' set :markdown_engine, :redcarpet set :markdown, :fenced_code_blocks => true, @@ -118,20 +115,21 @@ def stipendiat_year_tag(year) :smartypants => true + activate :relative_assets + # Build-specific configuration configure :build do + # For example, change the Compass output style for deployment 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 @@ -141,3 +139,8 @@ def stipendiat_year_tag(year) # Or use a different image path # set :http_path, "/Content/images/" end + +configure :development do + require "rack/livereload" + use Rack::LiveReload +end diff --git a/source/index.html.erb b/source/index.html.erb index a67bbcc..eb38185 100644 --- a/source/index.html.erb +++ b/source/index.html.erb @@ -3,7 +3,7 @@ layout: layout title: Välkommen! body_class: frontpage --- - +<%= image_tag 'logo-black.png' %>

Stiftelse FRED MED JORDEN skall stimulera och stödja personer, i första hand kvinnor, som vårdar sig om modernäringen genom att yrkesmässigt driva jordbruk eller handelsträdgård enligt metoder som bygger på kunskap om och tillit till jorden egen förmåga att förse en odling med nödvändiga växtnäringsämnen, när dess mikrobiologiska liv tillföres vad det behöver för en allsidig utveckling, samt att stödja forskning inom detta område.

diff --git a/source/layouts/layout.html.erb b/source/layouts/layout.html.erb index 2b145d5..841cf98 100644 --- a/source/layouts/layout.html.erb +++ b/source/layouts/layout.html.erb @@ -12,11 +12,9 @@ - - - - - + <%= favicon_tag 'favicon.ico' %> + <%= stylesheet_link_tag 'normalize','main','base','facybox' %> + <%= javascript_include_tag 'modernizr' %>