diff options
| author | Mark Longair <mhl@pobox.com> | 2013-12-09 09:53:29 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-12-09 09:53:29 +0000 |
| commit | 970d30d7f90177a7dc897e0d06b2f5ad06dffdb8 (patch) | |
| tree | 97133604c16182573987ba6ae98b0e64b762aa3f | |
| parent | 06cdb77c912bbcf85daa3784676fef662afe0741 (diff) | |
| parent | 58819831e0c2e4047011120f50d73456a09c95f7 (diff) | |
Merge branch 'feature/asset-fixes' into rails-3-develop
| -rw-r--r-- | app/views/general/_stylesheet_includes.html.erb | 2 | ||||
| -rw-r--r-- | app/views/layouts/no_chrome.html.erb | 1 | ||||
| -rw-r--r-- | config/application.rb | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/app/views/general/_stylesheet_includes.html.erb b/app/views/general/_stylesheet_includes.html.erb index b3f32054c..7a1648efd 100644 --- a/app/views/general/_stylesheet_includes.html.erb +++ b/app/views/general/_stylesheet_includes.html.erb @@ -17,6 +17,6 @@ <%= stylesheet_link_tag 'ie7.css' %> <![endif]--> <% if AlaveteliConfiguration::force_registration_on_new_request %> - <%= stylesheet_link_tag 'jquery.fancybox-1.3.4.pack.js', :rel => "stylesheet" %> + <%= stylesheet_link_tag 'jquery.fancybox-1.3.4.css', :rel => "stylesheet" %> <% end %> <% end %> diff --git a/app/views/layouts/no_chrome.html.erb b/app/views/layouts/no_chrome.html.erb index 589e1bb76..e613b8ca2 100644 --- a/app/views/layouts/no_chrome.html.erb +++ b/app/views/layouts/no_chrome.html.erb @@ -14,7 +14,6 @@ <%= stylesheet_link_tag 'application', :title => "Main", :rel => "stylesheet" %> <%= stylesheet_link_tag 'fonts', :rel => "stylesheet" %> - <%= stylesheet_link_tag 'theme', :rel => "stylesheet" %> <!--[if LT IE 7]> <%= stylesheet_link_tag 'ie6', :rel => "stylesheet" %> <![endif]--> diff --git a/config/application.rb b/config/application.rb index dba3a0c57..3c749a531 100644 --- a/config/application.rb +++ b/config/application.rb @@ -94,6 +94,7 @@ module Alaveteli # ... while these are individual files that can't easily be # grouped: config.assets.precompile += ['jquery.fancybox-1.3.4.pack.js', + 'jquery.fancybox-1.3.4.css', 'jquery.Jcrop.css', 'excanvas.min.js', 'fonts.css', |