website: update middleman, use asset pipeline
This commit is contained in:
Jack Pearkes
parent
644ad34eef
commit
4465a3a6a7
|
|
@ -1,12 +1,14 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gem "less", "~> 2.4.0"
|
||||
gem "middleman", "~> 3.1.5"
|
||||
gem "middleman", "~> 3.3.2"
|
||||
|
||||
gem "middleman-minify-html", "~> 3.1.1"
|
||||
gem "rack-contrib", "~> 1.1.0"
|
||||
gem "redcarpet", "~> 3.0.0"
|
||||
gem "therubyracer", "~> 0.12.0"
|
||||
gem "thin", "~> 1.5.0"
|
||||
gem "byebug"
|
||||
|
||||
group :development do
|
||||
gem "highline", "~> 1.6.15"
|
||||
|
|
|
|||
|
|
@ -1,31 +1,44 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (3.2.15)
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
multi_json (~> 1.0)
|
||||
chunky_png (1.2.9)
|
||||
activesupport (4.0.4)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
byebug (2.7.0)
|
||||
columnize (~> 0.3)
|
||||
debugger-linecache (~> 1.2)
|
||||
chunky_png (1.3.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.6.3)
|
||||
coffee-script-source (1.7.0)
|
||||
columnize (0.3.6)
|
||||
commonjs (0.2.7)
|
||||
compass (0.12.2)
|
||||
compass (0.12.5)
|
||||
chunky_png (~> 1.2)
|
||||
fssm (>= 0.2.7)
|
||||
sass (~> 3.1)
|
||||
sass (~> 3.2.19)
|
||||
compass-import-once (1.0.4)
|
||||
sass (>= 3.2, < 3.5)
|
||||
daemons (1.1.9)
|
||||
debugger-linecache (1.2.0)
|
||||
erubis (2.7.0)
|
||||
eventmachine (1.0.3)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
ffi (1.9.0)
|
||||
execjs (2.0.2)
|
||||
ffi (1.9.3)
|
||||
fssm (0.2.10)
|
||||
haml (4.0.3)
|
||||
haml (4.0.5)
|
||||
tilt
|
||||
highline (1.6.20)
|
||||
highline (1.6.21)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.5)
|
||||
kramdown (1.2.0)
|
||||
hooks (0.4.0)
|
||||
uber (~> 0.0.4)
|
||||
i18n (0.6.9)
|
||||
json (1.8.1)
|
||||
kramdown (1.3.3)
|
||||
less (2.4.0)
|
||||
commonjs (~> 0.2.7)
|
||||
libv8 (3.16.14.3)
|
||||
|
|
@ -33,79 +46,91 @@ GEM
|
|||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
rb-kqueue (>= 0.2)
|
||||
middleman (3.1.6)
|
||||
middleman (3.3.2)
|
||||
coffee-script (~> 2.2.0)
|
||||
compass (>= 0.12.2)
|
||||
execjs (~> 1.4.0)
|
||||
haml (>= 3.1.6)
|
||||
compass (>= 0.12.4)
|
||||
compass-import-once (~> 1.0.4)
|
||||
execjs (~> 2.0)
|
||||
haml (>= 4.0.5)
|
||||
kramdown (~> 1.2)
|
||||
middleman-core (= 3.1.6)
|
||||
middleman-more (= 3.1.6)
|
||||
middleman-core (= 3.3.2)
|
||||
middleman-sprockets (>= 3.1.2)
|
||||
sass (>= 3.1.20)
|
||||
uglifier (~> 2.1.0)
|
||||
middleman-core (3.1.6)
|
||||
activesupport (~> 3.2.6)
|
||||
sass (>= 3.2.17, < 4.0)
|
||||
uglifier (~> 2.5)
|
||||
middleman-core (3.3.2)
|
||||
activesupport (~> 4.0.1)
|
||||
bundler (~> 1.1)
|
||||
i18n (~> 0.6.1)
|
||||
erubis
|
||||
hooks (~> 0.3)
|
||||
i18n (~> 0.6.9)
|
||||
listen (~> 1.1)
|
||||
rack (>= 1.4.5)
|
||||
rack-test (~> 0.6.1)
|
||||
padrino-helpers (~> 0.12.1)
|
||||
rack (>= 1.4.5, < 2.0)
|
||||
rack-test (~> 0.6.2)
|
||||
thor (>= 0.15.2, < 2.0)
|
||||
tilt (~> 1.3.6)
|
||||
tilt (~> 1.4.1, < 2.0)
|
||||
middleman-minify-html (3.1.1)
|
||||
middleman-core (~> 3.0)
|
||||
middleman-more (3.1.6)
|
||||
middleman-sprockets (3.1.4)
|
||||
middleman-core (>= 3.0.14)
|
||||
middleman-more (>= 3.0.14)
|
||||
sprockets (~> 2.1)
|
||||
sprockets-helpers (~> 1.0.0)
|
||||
middleman-sprockets (3.3.2)
|
||||
middleman-core (>= 3.2)
|
||||
sprockets (~> 2.2)
|
||||
sprockets-helpers (~> 1.1.0)
|
||||
sprockets-sass (~> 1.0.0)
|
||||
multi_json (1.8.2)
|
||||
minitest (4.7.5)
|
||||
multi_json (1.9.2)
|
||||
padrino-helpers (0.12.1)
|
||||
i18n (~> 0.6, >= 0.6.7)
|
||||
padrino-support (= 0.12.1)
|
||||
tilt (~> 1.4.1)
|
||||
padrino-support (0.12.1)
|
||||
activesupport (>= 3.1)
|
||||
rack (1.5.2)
|
||||
rack-contrib (1.1.0)
|
||||
rack (>= 0.9.1)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rb-fsevent (0.9.3)
|
||||
rb-inotify (0.9.2)
|
||||
rb-fsevent (0.9.4)
|
||||
rb-inotify (0.9.3)
|
||||
ffi (>= 0.5.0)
|
||||
rb-kqueue (0.2.0)
|
||||
rb-kqueue (0.2.2)
|
||||
ffi (>= 0.5.0)
|
||||
redcarpet (3.0.0)
|
||||
ref (1.0.5)
|
||||
sass (3.2.12)
|
||||
sprockets (2.10.0)
|
||||
sass (3.2.19)
|
||||
sprockets (2.12.0)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-helpers (1.0.1)
|
||||
sprockets-helpers (1.1.0)
|
||||
sprockets (~> 2.0)
|
||||
sprockets-sass (1.0.2)
|
||||
sprockets-sass (1.0.3)
|
||||
sprockets (~> 2.0)
|
||||
tilt (~> 1.1)
|
||||
therubyracer (0.12.0)
|
||||
therubyracer (0.12.1)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
thin (1.5.1)
|
||||
daemons (>= 1.0.9)
|
||||
eventmachine (>= 0.12.6)
|
||||
rack (>= 1.0.0)
|
||||
thor (0.18.1)
|
||||
tilt (1.3.7)
|
||||
uglifier (2.1.2)
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.3)
|
||||
tilt (1.4.1)
|
||||
tzinfo (0.3.39)
|
||||
uber (0.0.4)
|
||||
uglifier (2.5.0)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
json (>= 1.8.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
byebug
|
||||
highline (~> 1.6.15)
|
||||
less (~> 2.4.0)
|
||||
middleman (~> 3.1.5)
|
||||
middleman (~> 3.3.2)
|
||||
middleman-minify-html (~> 3.1.1)
|
||||
rack-contrib (~> 1.1.0)
|
||||
redcarpet (~> 3.0.0)
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
<!-- Bootstrap core CSS -->
|
||||
<%= stylesheet_link_tag "bootstrap.min" %>
|
||||
<%= stylesheet_link_tag "main" %>
|
||||
// <%= stylesheet_link_tag "main" %>
|
||||
|
||||
<!-- google fonts -->
|
||||
<!-- <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700' rel='stylesheet' type='text/css'>
|
||||
|
|
|
|||
Loading…
Reference in New Issue