diff --git a/Gemfile b/Gemfile index f0cf27d..1b48475 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,7 @@ source "http://rubygems.org" gem "compass" gem "middleman" gem "middleman-smusher" +gem "middleman-livereload" gem "compass-holmes" gem 'oily_png' diff --git a/Gemfile.lock b/Gemfile.lock index 359bb1e..9040e7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,12 +15,17 @@ GEM sass (~> 3.1) compass-holmes (0.1.1) compass (>= 0.11) + em-websocket (0.4.0) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.5.3) + eventmachine (1.0.0) execjs (1.4.0) multi_json (~> 1.0) ffi (1.3.1) fssm (0.2.10) haml (3.1.7) hike (1.2.1) + http_parser.rb (0.5.3) http_router (0.10.2) rack (>= 1.0.0) url_mount (~> 0.2.1) @@ -44,6 +49,11 @@ GEM rb-inotify (~> 0.8.8) thor (~> 0.15.4) tilt (~> 1.3.1) + middleman-livereload (3.0.1) + em-websocket (>= 0.2.0) + middleman-core (~> 3.0.2) + multi_json (~> 1.0) + rack-livereload middleman-more (3.0.11) coffee-script (~> 2.2.0) coffee-script-source (~> 1.3.3) @@ -76,6 +86,8 @@ GEM i18n (~> 0.6) padrino-core (= 0.10.7) rack (1.4.5) + rack-livereload (0.3.11) + rack rack-protection (1.3.2) rack rack-test (0.6.2) @@ -124,6 +136,7 @@ DEPENDENCIES compass compass-holmes middleman + middleman-livereload middleman-smusher oily_png rake diff --git a/Rakefile b/Rakefile index 61c3325..cd960cf 100644 --- a/Rakefile +++ b/Rakefile @@ -18,7 +18,7 @@ task :deploy do exclude = "--exclude-from '#{File.expand_path('./rsync-exclude')}'" end puts "## Deploying website via Rsync" - ok_failed system("rsync -avze 'ssh -p #{ssh_port}' #{exclude} #{"--delete" unless rsync_delete == false} \"#{public_dir}/\" \"#{ssh_user}:#{document_root}\"") + system("rsync -avze 'ssh -p #{ssh_port}' #{exclude} #{"--delete" unless rsync_delete == false} \"#{public_dir}/\" \"#{ssh_user}:#{document_root}\"") end desc "Generate website and deploy" diff --git a/config.rb b/config.rb index 0826c18..4f05a55 100644 --- a/config.rb +++ b/config.rb @@ -96,6 +96,7 @@ configure :build do activate :gzip + activate :livereload # Or use a different image path # set :http_path, "/Content/images/" end diff --git a/source/_footer.slim b/source/_footer.slim index 062dd7d..3a3ff6a 100644 --- a/source/_footer.slim +++ b/source/_footer.slim @@ -1,11 +1,11 @@ a name="about" p ' © Copyright 2013 | - ==link_to "Albert Schulz", "/albert", :title => "About Albert" + == link_to "Albert Schulz", "/albert", title: "About Albert" ' , - ==link_to "Jörg Thalheim", "/joerg", :title => "About Jörg" + == link_to "Jörg Thalheim", "/joerg", title: "About Jörg" p ' using a href="http://ethanschoonover.com/solarized" title="color palette used on our website" target="_blank" solarized ', more infos - ==link_to "here", "/humans.txt", :title => "About this website" + == link_to "here", "/humans.txt", :title => "About this website" diff --git a/source/albert/index.html b/source/albert/index.html index 7c86f06..b238254 100644 --- a/source/albert/index.html +++ b/source/albert/index.html @@ -17,6 +17,7 @@ + @@ -84,11 +85,7 @@ Bullet Icons by FatCow - - - - - // Piwik + - -