diff options
| author | seb <seb@seb-U36JC> | 2011-11-21 14:55:11 +0000 |
|---|---|---|
| committer | seb <seb@seb-U36JC> | 2011-11-21 14:55:11 +0000 |
| commit | e649c2a7f19d0a75206149d886ff47b3ccda4e91 (patch) | |
| tree | 12c188947ef712b764fdc890c28b0222f05ad25a /app | |
| parent | 5128b4348862037139df45da15d4eee314bc710a (diff) | |
| parent | fa58d1b9eb961475d1eb3062cdbdf06fa8ca925c (diff) | |
Merge branch 'feature/refactor-css-seb' into develop
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/default.rhtml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 2af13f342..4008760a1 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -12,7 +12,6 @@ <link rel="shortcut icon" href="/favicon.ico"> <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet", :media => "all" %> <%= stylesheet_link_tag 'fonts', :rel => "stylesheet", :media => "all" %> - <%= stylesheet_link_tag 'theme', :rel => "stylesheet", :media => "all" %> <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "print" %> <% if !params[:print_stylesheet].nil? %> <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "all" %> @@ -35,11 +34,12 @@ <!--[if LT IE 8]> <style type="text/css">@import url("/stylesheets/ie7.css");</style> <![endif]--> - <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> + <!-- the following method for customising CSS is deprecated -- see `doc/THEMES.md for detail --> + <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> <% if force_registration_on_new_request %> <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet" %> <% end %> - + <% if @feed_autodetect %> <% for feed in @feed_autodetect %> <link rel="alternate" type="application/atom+xml" title="<%=h feed[:title] %>" href="<%=h feed[:url]%>"> |