wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

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

Browse Source 
Fixed custom.css to apply to all views
This commit is contained in:
bootstraponline
2012-11-19 16:11:53 -08:00
parent 10c121e603 2b910167f4
commit a34eac4ecb
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/frontend/app.rb
+1
View File
@@ -85,6 +85,7 @@ module Precious
@base_url = url('/', false).chomp('/') @base_url = url('/', false).chomp('/')
# above will detect base_path when it's used with map in a config.ru # above will detect base_path when it's used with map in a config.ru
settings.wiki_options.merge!({ :base_path => @base_url }) settings.wiki_options.merge!({ :base_path => @base_url })
@css = settings.wiki_options[:css]
end end
get '/' do get '/' do
lib/gollum/frontend/templates/file_view.mustache
+1
View File
@@ -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/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/template.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/_styles.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> <title>{{title}}</title>
</head> </head>
<body> <body>
lib/gollum/frontend/views/layout.rb
+5
View File
@@ -23,6 +23,11 @@ module Precious
def base_url def base_url
@base_url @base_url
end end
def css # custom css
@css
end
end end
end end
end end
lib/gollum/frontend/views/page.rb
-4
View File
@@ -89,10 +89,6 @@ module Precious
@mathjax @mathjax
end end
def css # custom css
@css
end
def use_identicon def use_identicon
@page.wiki.user_icons == 'identicon' @page.wiki.user_icons == 'identicon'
end end