diff options
| author | Mark Longair <mhl@pobox.com> | 2013-11-25 15:42:07 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-11-26 10:16:45 +0000 |
| commit | b6cd58b9a67304811d8eeeddb472f39aa6b4cfb1 (patch) | |
| tree | 8623b49ab7d2e60bd25d2493cb63dda259820f35 | |
| parent | e1930f6c5ac9542e20830c50ed5fdb7e3603b14c (diff) | |
Don't include the main stylesheet directly; it's now in application.css
| -rw-r--r-- | app/views/general/_stylesheet_includes.html.erb | 2 | ||||
| -rw-r--r-- | app/views/layouts/no_chrome.html.erb | 3 | ||||
| -rw-r--r-- | config/application.rb | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/app/views/general/_stylesheet_includes.html.erb b/app/views/general/_stylesheet_includes.html.erb index 390b5b10d..2571dd4ad 100644 --- a/app/views/general/_stylesheet_includes.html.erb +++ b/app/views/general/_stylesheet_includes.html.erb @@ -4,7 +4,7 @@ <%= Rails.application.assets["print.css"].to_s %> </style> <%- else %> - <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet", :media => "all" %> + <%= stylesheet_link_tag 'application', :title => "Main", :rel => "stylesheet", :media => "all" %> <%= stylesheet_link_tag 'fonts', :rel => "stylesheet", :media => "all" %> <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "print" %> <% if !params[:print_stylesheet].nil? %> diff --git a/app/views/layouts/no_chrome.html.erb b/app/views/layouts/no_chrome.html.erb index f7a40490e..589e1bb76 100644 --- a/app/views/layouts/no_chrome.html.erb +++ b/app/views/layouts/no_chrome.html.erb @@ -12,13 +12,12 @@ <%= javascript_include_tag "application" %> - <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> + <%= 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]--> - <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> </head> <body> <div class="entirebody"> diff --git a/config/application.rb b/config/application.rb index 10b1fc5c5..9ef9520b0 100644 --- a/config/application.rb +++ b/config/application.rb @@ -94,7 +94,6 @@ module Alaveteli 'excanvas.min.js', 'fonts.css', 'print.css', - 'main.css', 'admin.css', 'ie6.css', 'ie7.css'] |