diff options
| -rw-r--r-- | app/assets/stylesheets/ie6.css (renamed from public/stylesheets/ie6.css) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/ie7.css (renamed from public/stylesheets/ie7.css) | 0 | ||||
| -rw-r--r-- | app/views/general/_stylesheet_includes.html.erb | 4 | ||||
| -rw-r--r-- | app/views/layouts/no_chrome.html.erb | 2 | ||||
| -rw-r--r-- | config/application.rb | 4 |
5 files changed, 6 insertions, 4 deletions
diff --git a/public/stylesheets/ie6.css b/app/assets/stylesheets/ie6.css index 5eff5fac9..5eff5fac9 100644 --- a/public/stylesheets/ie6.css +++ b/app/assets/stylesheets/ie6.css diff --git a/public/stylesheets/ie7.css b/app/assets/stylesheets/ie7.css index c6e8fe4f2..c6e8fe4f2 100644 --- a/public/stylesheets/ie7.css +++ b/app/assets/stylesheets/ie7.css diff --git a/app/views/general/_stylesheet_includes.html.erb b/app/views/general/_stylesheet_includes.html.erb index b4bf1b7b3..4a8db2459 100644 --- a/app/views/general/_stylesheet_includes.html.erb +++ b/app/views/general/_stylesheet_includes.html.erb @@ -12,10 +12,10 @@ <% end %> <%= stylesheet_link_tag 'jquery-ui-1.8.15.custom.css', :rel => 'stylesheet'%> <!--[if LT IE 7]> - <style type="text/css">@import url("/stylesheets/ie6.css");</style> + <%= stylesheet_link_tag 'ie6.css' %> <![endif]--> <!--[if LT IE 8]> - <style type="text/css">@import url("/stylesheets/ie7.css");</style> + <%= stylesheet_link_tag 'ie7.css' %> <![endif]--> <% if AlaveteliConfiguration::force_registration_on_new_request %> <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet" %> diff --git a/app/views/layouts/no_chrome.html.erb b/app/views/layouts/no_chrome.html.erb index 090ee409b..f7a40490e 100644 --- a/app/views/layouts/no_chrome.html.erb +++ b/app/views/layouts/no_chrome.html.erb @@ -16,7 +16,7 @@ <%= stylesheet_link_tag 'fonts', :rel => "stylesheet" %> <%= stylesheet_link_tag 'theme', :rel => "stylesheet" %> <!--[if LT IE 7]> - <style type="text/css">@import url("/stylesheets/ie6.css");</style> + <%= stylesheet_link_tag 'ie6', :rel => "stylesheet" %> <![endif]--> <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> </head> diff --git a/config/application.rb b/config/application.rb index 426a68c63..acea68e8e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -92,7 +92,9 @@ module Alaveteli 'jquery-ui-1.8.15.custom.css', 'excanvas.min.js', 'fonts.css', - 'main.css'] + 'main.css', + 'ie6.css', + 'ie7.css'] end end |