Skip to content

Commit

Permalink
use sass for jammit css compression, no more java!
Browse files Browse the repository at this point in the history
jammit can use sass to minify css.  this is great
because now we don't need the yui-compressor.
which means that we don't need java.

Change-Id: I22d0f35340077a866ffe1000443bc5a061a9e613
Reviewed-on: https://gerrit.instructure.com/11588
Reviewed-by: Cody Cutrer <[email protected]>
QA-Review: Cody Cutrer <[email protected]>
Reviewed-by: Jacob Fugal <[email protected]>
Product-Review: Bryan Madsen <[email protected]>
Tested-by: Jenkins <[email protected]>
  • Loading branch information
ryankshaw authored and codekitchen committed Jun 4, 2013
1 parent b283022 commit f7bf153
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ gem 'hashery', '1.3.0', :require => 'hashery/dictionary'
gem 'highline', '1.6.1'
gem 'i18n', CANVAS_RAILS3 ? '0.5.0' : '0.6.0'
gem 'icalendar', '1.1.5'
gem 'jammit', '0.6.0'
gem 'jammit', '0.6.6'
gem 'json', '1.8.0'
# native xml parsing, diigo
gem 'libxml-ruby', '2.6.0', :require => 'xml/libxml'
Expand Down Expand Up @@ -77,8 +77,6 @@ gem 'useragent', '0.4.16'
gem 'uuid', '2.3.2'
gem 'will_paginate', '2.3.15'
gem 'xml-simple', '1.0.12', :require => 'xmlsimple'
# this is only needed by jammit, but we're pinning at 0.9.4 because 0.9.5 breaks
gem 'yui-compressor', '0.9.4'
gem 'foreigner', '0.9.2'
gem 'crocodoc-ruby', '0.0.1', :require => 'crocodoc'
gem 'regru-premailer', '1.7.7', :require => 'premailer'
Expand Down
3 changes: 1 addition & 2 deletions config/assets.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
embed_assets: off
gzip_assets: off
css_compressor_options:
line_break: 0
css_compressor: 'sass'

# if you want use IE in dev mode and want to get around the max of 30 stylesheets
# problem, uncomment the following lines and make sure you
Expand Down

0 comments on commit f7bf153

Please sign in to comment.