Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
This commit is contained in:
commit
335f4669f6
2 changed files with 1 additions and 2 deletions
|
@ -17,7 +17,7 @@
|
|||
<%= javascript_include_tag 'page_helper' %>
|
||||
|
||||
<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" %>;
|
||||
}
|
||||
<%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>
|
||||
|
|
|
@ -297,7 +297,6 @@ border:1px solid #900;
|
|||
|
||||
div.info {
|
||||
background-color:#DDD;
|
||||
color:#060;
|
||||
font-weight:bold;
|
||||
margin-top:0.5em;
|
||||
padding:0.5em;
|
||||
|
|
Loading…
Reference in a new issue