Bundle update and moving from sass-rails to sassc-rails
This commit is contained in:
parent
5f97904ca4
commit
2ef0ab156c
2
Gemfile
2
Gemfile
|
@ -117,7 +117,7 @@ group :development, :test, :assets do
|
||||||
# Use CoffeeScript for .coffee assets and views
|
# Use CoffeeScript for .coffee assets and views
|
||||||
gem 'coffee-rails'
|
gem 'coffee-rails'
|
||||||
# Use SASS for stylesheets
|
# Use SASS for stylesheets
|
||||||
gem 'sass-rails'
|
gem 'sassc-rails'
|
||||||
|
|
||||||
# Use jquery and jquery-ui as the JavaScript library
|
# Use jquery and jquery-ui as the JavaScript library
|
||||||
gem 'jquery-ui-rails'
|
gem 'jquery-ui-rails'
|
||||||
|
|
31
Gemfile.lock
31
Gemfile.lock
|
@ -117,7 +117,7 @@ GEM
|
||||||
ffi (1.9.25)
|
ffi (1.9.25)
|
||||||
flag-icons-rails (3.1.0)
|
flag-icons-rails (3.1.0)
|
||||||
sass (~> 3.2)
|
sass (~> 3.2)
|
||||||
font-awesome-sass (5.0.13)
|
font-awesome-sass (5.2.0)
|
||||||
sassc (>= 1.11)
|
sassc (>= 1.11)
|
||||||
formatador (0.2.5)
|
formatador (0.2.5)
|
||||||
formtastic (3.1.5)
|
formtastic (3.1.5)
|
||||||
|
@ -200,7 +200,7 @@ GEM
|
||||||
i18n-active_record (0.2.2)
|
i18n-active_record (0.2.2)
|
||||||
i18n (>= 0.5.0)
|
i18n (>= 0.5.0)
|
||||||
icalendar (2.4.1)
|
icalendar (2.4.1)
|
||||||
ice_cube (0.16.2)
|
ice_cube (0.16.3)
|
||||||
inherited_resources (1.8.0)
|
inherited_resources (1.8.0)
|
||||||
actionpack (>= 4.2, <= 5.2)
|
actionpack (>= 4.2, <= 5.2)
|
||||||
has_scope (~> 0.6)
|
has_scope (~> 0.6)
|
||||||
|
@ -287,7 +287,7 @@ GEM
|
||||||
rack (2.0.5)
|
rack (2.0.5)
|
||||||
rack-livereload (0.3.17)
|
rack-livereload (0.3.17)
|
||||||
rack
|
rack
|
||||||
rack-test (1.0.0)
|
rack-test (1.1.0)
|
||||||
rack (>= 1.0, < 3)
|
rack (>= 1.0, < 3)
|
||||||
rails (5.2.0)
|
rails (5.2.0)
|
||||||
actioncable (= 5.2.0)
|
actioncable (= 5.2.0)
|
||||||
|
@ -306,7 +306,7 @@ GEM
|
||||||
rails-assets-jquery-sparkline (2.1.3)
|
rails-assets-jquery-sparkline (2.1.3)
|
||||||
rails-assets-jquery-visible (1.2.0)
|
rails-assets-jquery-visible (1.2.0)
|
||||||
rails-assets-jquery (> 1.6.0)
|
rails-assets-jquery (> 1.6.0)
|
||||||
rails-assets-leaflet (1.3.1)
|
rails-assets-leaflet (1.3.3)
|
||||||
rails-assets-leaflet.markercluster (1.3.0)
|
rails-assets-leaflet.markercluster (1.3.0)
|
||||||
rails-assets-leaflet (>= 1.0.3)
|
rails-assets-leaflet (>= 1.0.3)
|
||||||
rails-controller-testing (1.0.2)
|
rails-controller-testing (1.0.2)
|
||||||
|
@ -345,7 +345,7 @@ GEM
|
||||||
responders (2.4.0)
|
responders (2.4.0)
|
||||||
actionpack (>= 4.2.0, < 5.3)
|
actionpack (>= 4.2.0, < 5.3)
|
||||||
railties (>= 4.2.0, < 5.3)
|
railties (>= 4.2.0, < 5.3)
|
||||||
rubocop (0.58.1)
|
rubocop (0.58.2)
|
||||||
jaro_winkler (~> 1.5.1)
|
jaro_winkler (~> 1.5.1)
|
||||||
parallel (~> 1.10)
|
parallel (~> 1.10)
|
||||||
parser (>= 2.5, != 2.5.1.1)
|
parser (>= 2.5, != 2.5.1.1)
|
||||||
|
@ -358,23 +358,24 @@ GEM
|
||||||
ruby_parser (3.11.0)
|
ruby_parser (3.11.0)
|
||||||
sexp_processor (~> 4.9)
|
sexp_processor (~> 4.9)
|
||||||
rubyzip (1.2.1)
|
rubyzip (1.2.1)
|
||||||
sass (3.5.6)
|
sass (3.5.7)
|
||||||
sass-listen (~> 4.0.0)
|
sass-listen (~> 4.0.0)
|
||||||
sass-listen (4.0.0)
|
sass-listen (4.0.0)
|
||||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||||
rb-inotify (~> 0.9, >= 0.9.7)
|
rb-inotify (~> 0.9, >= 0.9.7)
|
||||||
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)
|
|
||||||
sassc (1.12.1)
|
sassc (1.12.1)
|
||||||
ffi (~> 1.9.6)
|
ffi (~> 1.9.6)
|
||||||
sass (>= 3.3.0)
|
sass (>= 3.3.0)
|
||||||
|
sassc-rails (1.3.0)
|
||||||
|
railties (>= 4.0.0)
|
||||||
|
sass
|
||||||
|
sassc (~> 1.9)
|
||||||
|
sprockets (> 2.11)
|
||||||
|
sprockets-rails
|
||||||
|
tilt
|
||||||
sdoc (1.0.0)
|
sdoc (1.0.0)
|
||||||
rdoc (>= 5.0)
|
rdoc (>= 5.0)
|
||||||
selenium-webdriver (3.13.0)
|
selenium-webdriver (3.13.1)
|
||||||
childprocess (~> 0.5)
|
childprocess (~> 0.5)
|
||||||
rubyzip (~> 1.2)
|
rubyzip (~> 1.2)
|
||||||
sexp_processor (4.11.0)
|
sexp_processor (4.11.0)
|
||||||
|
@ -427,7 +428,7 @@ GEM
|
||||||
simple_oauth (~> 0.3.0)
|
simple_oauth (~> 0.3.0)
|
||||||
tzinfo (1.2.5)
|
tzinfo (1.2.5)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (4.1.15)
|
uglifier (4.1.16)
|
||||||
execjs (>= 0.3.0, < 3)
|
execjs (>= 0.3.0, < 3)
|
||||||
unf (0.1.4)
|
unf (0.1.4)
|
||||||
unf_ext
|
unf_ext
|
||||||
|
@ -499,7 +500,7 @@ DEPENDENCIES
|
||||||
rails-assets-leaflet.markercluster!
|
rails-assets-leaflet.markercluster!
|
||||||
rails-controller-testing
|
rails-controller-testing
|
||||||
rails-i18n
|
rails-i18n
|
||||||
sass-rails
|
sassc-rails
|
||||||
sdoc
|
sdoc
|
||||||
selenium-webdriver
|
selenium-webdriver
|
||||||
simple_calendar
|
simple_calendar
|
||||||
|
|
Loading…
Reference in New Issue