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-06-14 23:18:44 -05:00
commit 335f4669f6
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

@ -17,7 +17,7 @@
<%= javascript_include_tag 'page_helper' %> <%= javascript_include_tag 'page_helper' %>
<style type="text/css"> <style type="text/css">
h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 { h1#pageName, div.info, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 {
color: #<%= @web ? @web.color : "393" %>; color: #<%= @web ? @web.color : "393" %>;
} }
<%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %> <%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>

1
public/stylesheets/instiki.css
View file

@ -297,7 +297,6 @@ border:1px solid #900;
div.info { div.info {
background-color:#DDD; background-color:#DDD;
color:#060;
font-weight:bold; font-weight:bold;
margin-top:0.5em; margin-top:0.5em;
padding:0.5em; padding:0.5em;