aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/controllers/general_controller.rb6
-rw-r--r--app/views/general/custom_css.rhtml1
-rw-r--r--app/views/layouts/default.rhtml3
3 files changed, 9 insertions, 1 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index df46c4ae8..cf28208a0 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -153,5 +153,11 @@ class GeneralController < ApplicationController
render :text => "awake\n"
end
+ def custom_css
+ @locale = self.locale_from_params()
+ render(:layout => false, :content_type => 'text/css')
+ end
+
+
end
diff --git a/app/views/general/custom_css.rhtml b/app/views/general/custom_css.rhtml
new file mode 100644
index 000000000..0def82ed0
--- /dev/null
+++ b/app/views/general/custom_css.rhtml
@@ -0,0 +1 @@
+// this should be overridden in a local "theme" plugin
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 92a0ce11f..be302103a 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -24,10 +24,11 @@
<!--[if LT IE 7]>
<style type="text/css">@import url("/stylesheets/ie6.css");</style>
<![endif]-->
- <%= stylesheet_link_tag 'main-custom', :title => "Main", :rel => "stylesheet" %>
<!--[if LT IE 7]>
<style type="text/css">@import url("/stylesheets/ie6-custom.css");</style>
<![endif]-->
+ <%= stylesheet_link_tag 'main-custom', :title => "Main", :rel => "stylesheet" %>
+ <link href="http://127.0.0.1:3000/custom.css" media="screen" rel="stylesheet" type="text/css">
<% if @feed_autodetect %>
<% for feed in @feed_autodetect %>