diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-26 13:05:08 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-26 13:05:08 -0700 |
| commit | 27d6ad899f594bd9b79e54cdc5a3c17110f3b26c (patch) | |
| tree | b75973ee4325bd11f27220e38d1e899076948c78 /app/views/general/_stylesheet_includes.html.erb | |
| parent | 9bbc93bfd8ba8aaaf9bd1ad9031368b7faad8239 (diff) | |
| parent | 3194a7801684d010dac94c26cf39bb780bfcd17e (diff) | |
Merge branch 'release/0.12'0.12
Conflicts:
locale/he_IL/app.po
locale/hr_HR/app.po
locale/nb_NO/app.po
locale/uk/app.po
Diffstat (limited to 'app/views/general/_stylesheet_includes.html.erb')
| -rw-r--r-- | app/views/general/_stylesheet_includes.html.erb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/views/general/_stylesheet_includes.html.erb b/app/views/general/_stylesheet_includes.html.erb index 5b6e12258..9dd1f357d 100644 --- a/app/views/general/_stylesheet_includes.html.erb +++ b/app/views/general/_stylesheet_includes.html.erb @@ -8,14 +8,9 @@ <!--[if LT IE 7]> <style type="text/css">@import url("/stylesheets/ie6.css");</style> <![endif]--> - <!--[if LT IE 7]> - <style type="text/css">@import url("/stylesheets/ie6-custom.css");</style> - <![endif]--> <!--[if LT IE 8]> <style type="text/css">@import url("/stylesheets/ie7.css");</style> <![endif]--> - <!-- the following method for customising CSS is deprecated; see `doc/THEMES.md` for detail --> - <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> <% if AlaveteliConfiguration::force_registration_on_new_request %> <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet" %> <% end %> |