diff --git a/Gemfile b/Gemfile index fe45234e6..d848b7644 100644 --- a/Gemfile +++ b/Gemfile @@ -25,6 +25,9 @@ group :assets do gem 'handlebars_assets' gem 'jquery-datatables-rails' gem 'sass-rails' + # sass_rails_patch allows 'css.scss.erb' to work. + # delete this when upgrading to rails 4 (sass-rails 4.0.0 incorporates a similar fix) + gem 'sass_rails_patch' gem 'coffee-rails' gem 'uglifier' gem 'bootstrap-sass-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 7c12a7e14..79c61a82e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -217,11 +217,13 @@ GEM rubyzip (0.9.9) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) - sass (3.2.7) + sass (3.2.9) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) + sass_rails_patch (0.0.2) + sass-rails select2-rails (3.3.0) sass-rails (~> 3.2) thor (~> 0.14) @@ -313,6 +315,7 @@ DEPENDENCIES rspec-rails sanitize sass-rails + sass_rails_patch select2-rails sentry-raven sextant diff --git a/app/assets/stylesheets/_fonts.css.scss b/app/assets/stylesheets/_fonts.css.scss.erb similarity index 93% rename from app/assets/stylesheets/_fonts.css.scss rename to app/assets/stylesheets/_fonts.css.scss.erb index d11bd9828..08b5897c4 100644 --- a/app/assets/stylesheets/_fonts.css.scss +++ b/app/assets/stylesheets/_fonts.css.scss.erb @@ -1,5 +1,7 @@ -/* sweet font analytics */ -@import url("//hello.myfonts.net/count/262127"); +<% if Rails.env.production? %> + /* font analytics for licensing */ + @import url("//hello.myfonts.net/count/262127"); +<% end %> @font-face { font-family: 'Freehand521BT-RegularC';