deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2011-11-10 16:07:27 -06:00
parent 4a3d7e0b78 b52a66c207
commit def8e9ae0f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/default.rhtml
View file

@ -28,7 +28,7 @@
<%= Rails.root.join('public', 'stylesheets', 'instiki.css').read if @inline_style %> <%= Rails.root.join('public', 'stylesheets', 'instiki.css').read if @inline_style %>
<%= Rails.root.join('public', 'stylesheets', 'syntax.css').read if @inline_style %> <%= Rails.root.join('public', 'stylesheets', 'syntax.css').read if @inline_style %>
</style> </style>
<%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %> <%= "<style type='text/css'>#{@style_additions}</style>".html_safe if @style_additions %>
<style type="text/css"><!--/*--><![CDATA[/*><!--*/ <style type="text/css"><!--/*--><![CDATA[/*><!--*/
<%= @web && @web.additional_style ? @web.additional_style.html_safe : '' %> <%= @web && @web.additional_style ? @web.additional_style.html_safe : '' %>
/*]]>*/--></style> /*]]>*/--></style>

2
app/views/wiki/source.html.erb
View file

@ -19,7 +19,7 @@
<%= Rails.root.join('public', 'stylesheets', 'instiki.css').read if @inline_style %> <%= Rails.root.join('public', 'stylesheets', 'instiki.css').read if @inline_style %>
</style> </style>
<%= stylesheet_link_tag 'instiki', :media => 'all' unless @inline_style %> <%= stylesheet_link_tag 'instiki', :media => 'all' unless @inline_style %>
<%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %> <%= "<style type='text/css'>#{@style_additions}</style>".html_safe if @style_additions %>
<style type="text/css"><!--/*--><![CDATA[/*><!--*/ <style type="text/css"><!--/*--><![CDATA[/*><!--*/
<%= @web ? @web.additional_style : '' %> <%= @web ? @web.additional_style : '' %>
/*]]>*/--></style> /*]]>*/--></style>