upgrade used middlemans version
This commit is contained in:
parent
958838136f
commit
fac3277f87
2
Gemfile
2
Gemfile
@ -1,7 +1,7 @@
|
|||||||
source "http://rubygems.org"
|
source "http://rubygems.org"
|
||||||
|
|
||||||
gem "compass", ">= 0.13.alpha.0"
|
gem "compass", ">= 0.13.alpha.0"
|
||||||
gem "middleman", ">= 3.0.0.rc.1"
|
gem "middleman", ">= 3.0.0rc4"
|
||||||
gem "middleman-smusher"
|
gem "middleman-smusher"
|
||||||
|
|
||||||
gem 'compass-960-plugin'
|
gem 'compass-960-plugin'
|
||||||
|
60
Gemfile.lock
60
Gemfile.lock
@ -15,7 +15,7 @@ GEM
|
|||||||
sass (~> 3.2.0.alpha.93)
|
sass (~> 3.2.0.alpha.93)
|
||||||
compass-960-plugin (0.10.4)
|
compass-960-plugin (0.10.4)
|
||||||
compass (>= 0.10.0)
|
compass (>= 0.10.0)
|
||||||
execjs (1.3.2)
|
execjs (1.4.0)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
ffi (1.0.11)
|
ffi (1.0.11)
|
||||||
fssm (0.2.9)
|
fssm (0.2.9)
|
||||||
@ -27,54 +27,54 @@ GEM
|
|||||||
httpclient (2.2.5)
|
httpclient (2.2.5)
|
||||||
i18n (0.6.0)
|
i18n (0.6.0)
|
||||||
json (1.7.3)
|
json (1.7.3)
|
||||||
listen (0.4.6)
|
listen (0.4.7)
|
||||||
rb-fchange (~> 0.0.5)
|
rb-fchange (~> 0.0.5)
|
||||||
rb-fsevent (~> 0.9.1)
|
rb-fsevent (~> 0.9.1)
|
||||||
rb-inotify (~> 0.8.8)
|
rb-inotify (~> 0.8.8)
|
||||||
maruku (0.6.0)
|
maruku (0.6.0)
|
||||||
syntax (>= 1.0.0)
|
syntax (>= 1.0.0)
|
||||||
middleman (3.0.0.rc.1)
|
middleman (3.0.0)
|
||||||
middleman-core (= 3.0.0.rc.1)
|
middleman-core (= 3.0.0)
|
||||||
middleman-more (= 3.0.0.rc.1)
|
middleman-more (= 3.0.0)
|
||||||
middleman-sprockets (= 3.0.0.rc.1)
|
middleman-sprockets (= 3.0.0)
|
||||||
middleman-core (3.0.0.rc.1)
|
middleman-core (3.0.0)
|
||||||
activesupport (~> 3.2.4)
|
activesupport (~> 3.2.6)
|
||||||
bundler (~> 1.1)
|
bundler (~> 1.1)
|
||||||
listen (~> 0.4.2)
|
listen (~> 0.4.7)
|
||||||
rack (~> 1.4.0)
|
rack (~> 1.4.1)
|
||||||
rack-test (~> 0.6.1)
|
rack-test (~> 0.6.1)
|
||||||
thor (~> 0.14.3)
|
thor (~> 0.15.4)
|
||||||
tilt (~> 1.3.1)
|
tilt (~> 1.3.1)
|
||||||
middleman-more (3.0.0.rc.1)
|
middleman-more (3.0.0)
|
||||||
coffee-script (~> 2.2.0)
|
coffee-script (~> 2.2.0)
|
||||||
coffee-script-source (~> 1.3.3)
|
coffee-script-source (~> 1.3.3)
|
||||||
compass (>= 0.12.1)
|
compass (>= 0.12.2)
|
||||||
execjs (~> 1.3.2)
|
execjs (~> 1.4.0)
|
||||||
haml (>= 3.1.0)
|
haml (>= 3.1.6)
|
||||||
i18n (~> 0.6.0)
|
i18n (~> 0.6.0)
|
||||||
maruku (~> 0.6.0)
|
maruku (~> 0.6.0)
|
||||||
middleman-core (= 3.0.0.rc.1)
|
middleman-core (= 3.0.0)
|
||||||
padrino-helpers (~> 0.10.6)
|
padrino-helpers (= 0.10.7)
|
||||||
sass (>= 3.1.7)
|
sass (>= 3.1.20)
|
||||||
uglifier (~> 1.2.0)
|
uglifier (~> 1.2.6)
|
||||||
middleman-smusher (0.0.1)
|
middleman-smusher (0.0.1)
|
||||||
smusher (~> 0.4.6)
|
smusher (~> 0.4.6)
|
||||||
middleman-sprockets (3.0.0.rc.1)
|
middleman-sprockets (3.0.0)
|
||||||
middleman-more (= 3.0.0.rc.1)
|
middleman-more (= 3.0.0)
|
||||||
sprockets (~> 2.1)
|
sprockets (~> 2.1)
|
||||||
sprockets-sass (~> 0.8.0)
|
sprockets-sass (~> 0.8.0)
|
||||||
multi_json (1.3.6)
|
multi_json (1.3.6)
|
||||||
oily_png (1.0.2)
|
oily_png (1.0.2)
|
||||||
chunky_png (~> 1.2.1)
|
chunky_png (~> 1.2.1)
|
||||||
padrino-core (0.10.6)
|
padrino-core (0.10.7)
|
||||||
activesupport (~> 3.2.0)
|
activesupport (~> 3.2.0)
|
||||||
http_router (~> 0.10.2)
|
http_router (~> 0.10.2)
|
||||||
sinatra (~> 1.3.1)
|
sinatra (~> 1.3.1)
|
||||||
thor (~> 0.14.3)
|
thor (~> 0.15.2)
|
||||||
tilt (~> 1.3.0)
|
tilt (~> 1.3.0)
|
||||||
padrino-helpers (0.10.6)
|
padrino-helpers (0.10.7)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
padrino-core (= 0.10.6)
|
padrino-core (= 0.10.7)
|
||||||
rack (1.4.1)
|
rack (1.4.1)
|
||||||
rack-protection (1.2.0)
|
rack-protection (1.2.0)
|
||||||
rack
|
rack
|
||||||
@ -86,7 +86,7 @@ GEM
|
|||||||
rb-fsevent (0.9.1)
|
rb-fsevent (0.9.1)
|
||||||
rb-inotify (0.8.8)
|
rb-inotify (0.8.8)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
sass (3.2.0.alpha.247)
|
sass (3.2.0.alpha.269)
|
||||||
sinatra (1.3.2)
|
sinatra (1.3.2)
|
||||||
rack (~> 1.3, >= 1.3.6)
|
rack (~> 1.3, >= 1.3.6)
|
||||||
rack-protection (~> 1.2)
|
rack-protection (~> 1.2)
|
||||||
@ -98,7 +98,7 @@ GEM
|
|||||||
httpclient (>= 2.2)
|
httpclient (>= 2.2)
|
||||||
json
|
json
|
||||||
rake
|
rake
|
||||||
sprockets (2.4.3)
|
sprockets (2.4.5)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
@ -108,9 +108,9 @@ GEM
|
|||||||
tilt (~> 1.1)
|
tilt (~> 1.1)
|
||||||
syntax (1.0.0)
|
syntax (1.0.0)
|
||||||
temple (0.4.0)
|
temple (0.4.0)
|
||||||
thor (0.14.6)
|
thor (0.15.4)
|
||||||
tilt (1.3.3)
|
tilt (1.3.3)
|
||||||
uglifier (1.2.5)
|
uglifier (1.2.6)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
url_mount (0.2.1)
|
url_mount (0.2.1)
|
||||||
@ -122,7 +122,7 @@ PLATFORMS
|
|||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
compass (>= 0.13.alpha.0)
|
compass (>= 0.13.alpha.0)
|
||||||
compass-960-plugin
|
compass-960-plugin
|
||||||
middleman (>= 3.0.0.rc.1)
|
middleman (>= 3.0.0rc4)
|
||||||
middleman-smusher
|
middleman-smusher
|
||||||
oily_png
|
oily_png
|
||||||
rake
|
rake
|
||||||
|
Loading…
Reference in New Issue
Block a user