diff options
| -rw-r--r-- | app/controllers/general_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/general/_stylesheet_includes.html.erb | 5 | ||||
| -rw-r--r-- | app/views/general/custom_css.html.erb | 1 | ||||
| -rw-r--r-- | app/views/layouts/no_chrome.html.erb | 17 | ||||
| -rw-r--r-- | config/routes.rb | 1 | ||||
| -rw-r--r-- | public/stylesheets/ie6-custom.css | 1 | ||||
| -rw-r--r-- | spec/controllers/general_controller_spec.rb | 1 |
7 files changed, 7 insertions, 25 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 52b4b3e0e..15f5df840 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -209,12 +209,6 @@ class GeneralController < ApplicationController @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss], :has_json => true } ] end - def custom_css - long_cache - @locale = self.locale_from_params() - render(:layout => false, :content_type => 'text/css') - end - # Handle requests for non-existent URLs - will be handled by ApplicationController::render_exception def not_found raise RouteNotFound 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 %> diff --git a/app/views/general/custom_css.html.erb b/app/views/general/custom_css.html.erb deleted file mode 100644 index 0def82ed0..000000000 --- a/app/views/general/custom_css.html.erb +++ /dev/null @@ -1 +0,0 @@ -// this should be overridden in a local "theme" plugin diff --git a/app/views/layouts/no_chrome.html.erb b/app/views/layouts/no_chrome.html.erb index 120ba6f28..d7918cffc 100644 --- a/app/views/layouts/no_chrome.html.erb +++ b/app/views/layouts/no_chrome.html.erb @@ -12,19 +12,16 @@ <script type="text/javascript" src="/javascripts/jquery.js"></script> - <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> - <%= 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> - <![endif]--> - <!--[if LT IE 7]> - <style type="text/css">@import url("/stylesheets/ie6-custom.css");</style> + <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> + <%= 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> <![endif]--> <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> </head> <body> - <div class="entirebody"> + <div class="entirebody"> <div id="content"> <% if flash[:notice] %> <div id="notice"><%= flash[:notice] %></div> @@ -39,4 +36,4 @@ </div> </div> </body> -</html>
\ No newline at end of file +</html> diff --git a/config/routes.rb b/config/routes.rb index 56be975c3..062973e37 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,7 +14,6 @@ Alaveteli::Application.routes.draw do #### General contoller match '/' => 'general#frontpage', :as => :frontpage match '/blog' => 'general#blog', :as => :blog - match '/stylesheets/custom.css' => 'general#custom_css', :as => :custom_css match '/search' => 'general#search_redirect', :as => :search_redirect match '/search/all' => 'general#search_redirect', :as => :search_redirect # XXX combined is the search query, and then if sorted a "/newest" at the end. diff --git a/public/stylesheets/ie6-custom.css b/public/stylesheets/ie6-custom.css deleted file mode 100644 index 64d632e72..000000000 --- a/public/stylesheets/ie6-custom.css +++ /dev/null @@ -1 +0,0 @@ -/* drop your local IE-specific CSS overrides in here */ diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index 4a1c8b134..bce12248b 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -348,4 +348,3 @@ describe GeneralController, 'when using xapian search' do end end - |