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 2009-11-22 00:33:18 -06:00
parent 7a8aef6020 045dcbf1f5
commit 13c8990c80
2 changed files with 1 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

@ -22,7 +22,7 @@
} }
<%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %> <%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>
</style> </style>
<%= stylesheet_link_tag 'instiki' 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>" if @style_additions %>
<style type="text/css"><!--/*--><![CDATA[/*><!--*/ <style type="text/css"><!--/*--><![CDATA[/*><!--*/
<%= @web ? @web.additional_style : '' %> <%= @web ? @web.additional_style : '' %>

1
app/views/wiki/print.rhtml
View file

@ -2,7 +2,6 @@
@title = @page.plain_name @title = @page.plain_name
@hide_navigation = true @hide_navigation = true
@style_additions = ".newWikiWord { background-color: white; font-style: italic; }" @style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
@inline_style = true
-%> -%>
<%= @renderer.display_content_for_export %> <%= @renderer.display_content_for_export %>