Use sass-rails for CSS compression

This commit is contained in:
Helge Rausch
2015-10-23 21:43:25 +02:00
parent e5428701ce
commit 0858308210
3 changed files with 17 additions and 14 deletions

17
Gemfile
View File

@@ -6,10 +6,10 @@ gem 'rails', '~> 4.2.0'
gem 'authlogic' # lots of user-related magic
gem 'i18n', '>= 0.6.6'
gem 'rails3-generators'
gem "jquery-rails"
gem 'bcrypt-ruby', :require => "bcrypt"
gem 'jquery-rails'
gem 'bcrypt-ruby', :require => 'bcrypt'
gem 'sanitize'
gem "recaptcha", :require => "recaptcha/rails"
gem 'recaptcha', :require => 'recaptcha/rails'
gem 'dynamic_form'
gem 'lograge'
gem 'slop'
@@ -34,13 +34,13 @@ gem 'pg_search'
# so we can create zip-files for genotypes
gem 'rubyzip'
gem "will_paginate"
gem 'will_paginate'
gem 'nested_form', github: 'ryanb/nested_form'
gem 'json'
gem 'mediawiki-gateway'
gem 'paperclip', '~> 4.0 '
gem 'friendly_id'
gem 'recommendify', github: 'paulasmuth/recommendify', :ref => "34308c4"
gem 'recommendify', github: 'paulasmuth/recommendify', :ref => '34308c4'
# background jobs
gem 'sidekiq'
@@ -55,10 +55,9 @@ gem 'whenever', require: false
gem 'therubyracer'
gem 'execjs'
gem 'uglifier'
gem 'yui-compressor'
gem "twitter-bootstrap-rails"
gem "jquery-ui-rails"
gem "sass"
gem 'twitter-bootstrap-rails'
gem 'jquery-ui-rails'
gem 'sass-rails'
#group :production do
# gem 'rpm_contrib'

View File

@@ -293,7 +293,13 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (= 1.4.1)
sass (3.4.13)
sass (3.4.19)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
scrypt (1.2.1)
ffi-compiler (>= 0.0.2)
rake
@@ -365,7 +371,6 @@ GEM
xpath (2.0.0)
nokogiri (~> 1.3)
yajl-ruby (1.2.1)
yui-compressor (0.12.0)
PLATFORMS
ruby
@@ -410,7 +415,7 @@ DEPENDENCIES
rubyzip
rvm-capistrano (= 1.4.4)
sanitize
sass
sass-rails
shoulda-context
sidekiq
sidekiq-limit_fetch
@@ -430,7 +435,6 @@ DEPENDENCIES
webmock
whenever
will_paginate
yui-compressor
BUNDLED WITH
1.10.6

View File

@@ -52,7 +52,7 @@ Snpr::Application.configure do
# Compress JavaScript and CSS
config.assets.compress = true
config.assets.js_compressor = :uglifier
config.assets.css_compressor = :yui
#config.assets.css_compressor = :yui
# Don't fallback to assets pipeline
config.assets.compile = false