forked from OpenNeo/impress
Upgrade sass-rails & compass-rails
Compass wasn't working in Rails 4, there's still some errors in the details but now it's not crashing on that anymore!
This commit is contained in:
parent
90f799faf8
commit
aab7dc612c
18 changed files with 31 additions and 17 deletions
4
Gemfile
4
Gemfile
|
@ -62,8 +62,8 @@ gem 'react-rails', '~> 2.7', '>= 2.7.1'
|
|||
|
||||
gem "letter_opener", :group => :development
|
||||
|
||||
gem 'sass-rails', "~> 4.0.5"
|
||||
gem 'compass-rails', "~> 1.0.3"
|
||||
gem 'sass-rails', '~> 5.0', '>= 5.0.7'
|
||||
gem 'compass-rails', '~> 3.1'
|
||||
gem 'uglifier', ">= 1.0.3"
|
||||
|
||||
# Backfills for old Rails behaviors
|
||||
|
|
44
Gemfile.lock
44
Gemfile.lock
|
@ -68,13 +68,23 @@ GEM
|
|||
ssrf_filter (~> 1.0, < 1.1.0)
|
||||
character-encodings (0.4.1)
|
||||
chronic (0.6.7)
|
||||
chunky_png (1.3.4)
|
||||
compass (0.12.7)
|
||||
chunky_png (1.4.0)
|
||||
compass (1.0.3)
|
||||
chunky_png (~> 1.2)
|
||||
fssm (>= 0.2.7)
|
||||
sass (~> 3.2.19)
|
||||
compass-rails (1.0.3)
|
||||
compass (>= 0.12.2, < 0.14)
|
||||
compass-core (~> 1.0.2)
|
||||
compass-import-once (~> 1.0.5)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
sass (>= 3.3.13, < 3.5)
|
||||
compass-core (1.0.3)
|
||||
multi_json (~> 1.0)
|
||||
sass (>= 3.3.0, < 3.5)
|
||||
compass-import-once (1.0.5)
|
||||
sass (>= 3.2, < 3.5)
|
||||
compass-rails (3.1.0)
|
||||
compass (~> 1.0.0)
|
||||
sass-rails (< 5.1)
|
||||
sprockets (< 4.0)
|
||||
concurrent-ruby (1.1.10)
|
||||
connection_pool (2.2.5)
|
||||
devise (3.5.10)
|
||||
|
@ -97,6 +107,7 @@ GEM
|
|||
factory_girl_rails (1.7.0)
|
||||
factory_girl (~> 2.6.0)
|
||||
railties (>= 3.0.0)
|
||||
ffi (1.12.2)
|
||||
fog (1.8.0)
|
||||
builder
|
||||
excon (~> 0.14)
|
||||
|
@ -108,7 +119,6 @@ GEM
|
|||
nokogiri (~> 1.5.0)
|
||||
ruby-hmac
|
||||
formatador (0.2.5)
|
||||
fssm (0.2.10)
|
||||
globalize (4.0.3)
|
||||
activemodel (>= 4.0.0, < 5)
|
||||
activerecord (>= 4.0.0, < 5)
|
||||
|
@ -177,6 +187,9 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (13.0.6)
|
||||
rb-fsevent (0.11.2)
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
rdiscount (1.6.8)
|
||||
react-rails (2.7.1)
|
||||
babel-transpiler (>= 0.7.0)
|
||||
|
@ -224,12 +237,13 @@ GEM
|
|||
capistrano (~> 2.15.4)
|
||||
sanitize (2.0.6)
|
||||
nokogiri (>= 1.4.4)
|
||||
sass (3.2.19)
|
||||
sass-rails (4.0.5)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.2.2)
|
||||
sprockets (~> 2.8, < 3.0)
|
||||
sprockets-rails (~> 2.0)
|
||||
sass (3.4.25)
|
||||
sass-rails (5.0.7)
|
||||
railties (>= 4.0.0, < 6)
|
||||
sass (~> 3.1)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
tilt (>= 1.1, < 3)
|
||||
sinatra (1.4.6)
|
||||
rack (~> 1.4)
|
||||
rack-protection (~> 1.4)
|
||||
|
@ -273,7 +287,7 @@ DEPENDENCIES
|
|||
capistrano (~> 2.15.5)
|
||||
carrierwave (~> 1.3, >= 1.3.3)
|
||||
character-encodings (~> 0.4.1)
|
||||
compass-rails (~> 1.0.3)
|
||||
compass-rails (~> 3.1)
|
||||
devise (~> 3.5.10)
|
||||
dotenv-deployment
|
||||
dotenv-rails
|
||||
|
@ -307,7 +321,7 @@ DEPENDENCIES
|
|||
rspec-rails (~> 2.0.0.beta.22)
|
||||
rvm-capistrano (~> 1.5.6)
|
||||
sanitize (~> 2.0.3)
|
||||
sass-rails (~> 4.0.5)
|
||||
sass-rails (~> 5.0, >= 5.0.7)
|
||||
swf_converter (~> 0.0.3)
|
||||
uglifier (>= 1.0.3)
|
||||
whenever (~> 0.7.3)
|
||||
|
|
BIN
vendor/cache/chunky_png-1.3.4.gem
vendored
BIN
vendor/cache/chunky_png-1.3.4.gem
vendored
Binary file not shown.
BIN
vendor/cache/chunky_png-1.4.0.gem
vendored
Normal file
BIN
vendor/cache/chunky_png-1.4.0.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/compass-0.12.7.gem
vendored
BIN
vendor/cache/compass-0.12.7.gem
vendored
Binary file not shown.
BIN
vendor/cache/compass-1.0.3.gem
vendored
Normal file
BIN
vendor/cache/compass-1.0.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/compass-core-1.0.3.gem
vendored
Normal file
BIN
vendor/cache/compass-core-1.0.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/compass-import-once-1.0.5.gem
vendored
Normal file
BIN
vendor/cache/compass-import-once-1.0.5.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/compass-rails-1.0.3.gem
vendored
BIN
vendor/cache/compass-rails-1.0.3.gem
vendored
Binary file not shown.
BIN
vendor/cache/compass-rails-3.1.0.gem
vendored
Normal file
BIN
vendor/cache/compass-rails-3.1.0.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/ffi-1.12.2.gem
vendored
Normal file
BIN
vendor/cache/ffi-1.12.2.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/fssm-0.2.10.gem
vendored
BIN
vendor/cache/fssm-0.2.10.gem
vendored
Binary file not shown.
BIN
vendor/cache/rb-fsevent-0.11.2.gem
vendored
Normal file
BIN
vendor/cache/rb-fsevent-0.11.2.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/rb-inotify-0.10.1.gem
vendored
Normal file
BIN
vendor/cache/rb-inotify-0.10.1.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/sass-3.2.19.gem
vendored
BIN
vendor/cache/sass-3.2.19.gem
vendored
Binary file not shown.
BIN
vendor/cache/sass-3.4.25.gem
vendored
Normal file
BIN
vendor/cache/sass-3.4.25.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/sass-rails-4.0.5.gem
vendored
BIN
vendor/cache/sass-rails-4.0.5.gem
vendored
Binary file not shown.
BIN
vendor/cache/sass-rails-5.0.7.gem
vendored
Normal file
BIN
vendor/cache/sass-rails-5.0.7.gem
vendored
Normal file
Binary file not shown.
Loading…
Reference in a new issue