Merge pull request #592 from dekimsey/global-custom-css

Fixed custom.css to apply to all views
2012-11-19 16:11:53 -08:00
parent 10c121e603 2b910167f4
commit a34eac4ecb
4 changed files with 7 additions and 4 deletions
@@ -85,6 +85,7 @@ module Precious
      @base_url = url('/', false).chomp('/')
      # above will detect base_path when it's used with map in a config.ru
      settings.wiki_options.merge!({ :base_path => @base_url })
+      @css = settings.wiki_options[:css]
    end

    get '/' do
@@ -5,6 +5,7 @@
  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/gollum.css" media="all">
  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/template.css" media="all">
  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/_styles.css" media="all">
+  {{#css}}<link rel="stylesheet" type="text/css" href="{{base_url}}/custom.css" media="all">{{/css}}
  <title>{{title}}</title>
 </head>
 <body>
@@ -23,6 +23,11 @@ module Precious
      def base_url
        @base_url
      end
+
+      def css # custom css
+        @css
+      end
+
    end
  end
 end
@@ -89,10 +89,6 @@ module Precious
        @mathjax
      end

-      def css # custom css
-        @css
-      end
-
      def use_identicon
        @page.wiki.user_icons == 'identicon'
      end