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 2010-01-23 00:24:48 -06:00
parent 1bf8177e70 979ea7eca0
commit 512b8d60b9
4 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/helpers/wiki_helper.rb
View file

@ -91,6 +91,9 @@ module WikiHelper
{:class => 'navlink', :id => 'rollback', :rel => 'nofollow'})
end
def darken(s)
n=s.length/3
s.scan( %r(\w{#{n},#{n}}) ).collect {|a| (a.hex * 2/3).to_s(16).rjust(n,'0')}.join
end
end

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

@ -16,15 +16,18 @@
<%= javascript_include_tag 'page_helper' %>
<%= stylesheet_link_tag 'instiki', :media => 'all' unless @inline_style %>
<%= stylesheet_link_tag 'syntax', :media => 'all' unless @inline_style %>
<style type="text/css">
h1#pageName, div.info, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, [actiontype="toggle"]:hover, #TextileHelp h3 {
color: #<%= @web ? @web.color : "393" %>;
}
a:visited.existingWikiWord {
color: #<%= darken(@web ? @web.color : "393") %>;
}
<%= Rails.root.join('public', 'stylesheets', 'instiki.css').read if @inline_style %>
<%= Rails.root.join('public', 'stylesheets', 'syntax.css').read if @inline_style %>
</style>
<%= stylesheet_link_tag 'instiki', :media => 'all' unless @inline_style %>
<%= stylesheet_link_tag 'syntax', :media => 'all' unless @inline_style %>
<%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %>
<style type="text/css"><!--/*--><![CDATA[/*><!--*/
<%= @web ? @web.additional_style : '' %>

2
app/views/svg_logo.html.erb
View file

@ -1,4 +1,4 @@
<span id="svg_logo"><svg version="1.1" width="100%" height="100%" viewBox='0 0 180 197' xmlns='http://www.w3.org/2000/svg'>
<span id="svg_logo"><svg version="1.1" width="100%" height="100%" viewBox='0 -1 180 198' xmlns='http://www.w3.org/2000/svg'>
<path id="svg_logo_path" fill="#<%= @web ? @web.color : "393" %>" stroke-width='0.5' stroke='#000' d='
M170,60c4,11-1,20-12,25c-9,4-25,3-20,15c5,5,15,0,24,1c11,1,21,11,14,21c-10,15-35,6-48-1c-5-3-27-23-32-10c-1,13,15,10,22,16
c11,4,24,14,34,20c12,10,7,25-9,23c-11-1-22-9-30-16c-5-5-13-18-21-9c-2,6,2,11,5,14c9,9,22,14,22,31c-2,8-12,8-18,4c-4-3-9-8-11-13

21
public/stylesheets/instiki.css
View file

@ -27,7 +27,7 @@ max-width:55em;
}
a:visited {
color:#555;
color:#666;
}
h1,h2,h3,h4,h5,h6 {
@ -68,7 +68,7 @@ width:1.5em;
height:1.625em;
}
a.nav,a.nav:link,a.nav:visited {
a.nav,a:link.nav, a:visited.nav {
background-color:#FFF;
color:#000;
}
@ -381,11 +381,11 @@ color:#000;
}
a.existingWikiWord[title]{
border: 1px dashed #000;
//border: 1px dashed #BBB;
}
.web_protected a.existingWikiWord[title], .web_normal a.existingWikiWord[title] {
border: none;
// border: none;
}
a:hover, a.nav:hover, a:hover math {
@ -393,6 +393,19 @@ background-color:#000;
color:#FFF;
}
a:hover.existingWikiWord, a:visited:hover.existingWikiWord {
background-color:#008;
color:#FFF;
}
a:hover.existingWikiWord[title] {
background-color:#707;
color:#FFF;
}
.web_protected a:hover.existingWikiWord[title], .web_normal a:hover.existingWikiWord[title] {
background-color:#000;
color:#FFF;
}
div.errorExplanation p,div.errorExplanation li {
border:none;
margin:0;