From 979ea7eca007901ad29538a0655d79f09e48dc3d Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Sat, 23 Jan 2010 00:21:14 -0600
Subject: [PATCH] CSS Improvements

Fixed a few aesthetic matters.
---
 app/helpers/wiki_helper.rb      |  5 ++++-
 app/views/layouts/default.rhtml |  7 +++++--
 app/views/svg_logo.html.erb     |  2 +-
 public/stylesheets/instiki.css  | 25 +++++++++++++++++++------
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index e88f9765..6a1a2ed2 100644
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -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
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 8782dbbf..79dba5dc 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -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 : '' %>
diff --git a/app/views/svg_logo.html.erb b/app/views/svg_logo.html.erb
index 67911c6b..9d64ad27 100644
--- a/app/views/svg_logo.html.erb
+++ b/app/views/svg_logo.html.erb
@@ -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
diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css
index 82fb1717..a62c48db 100644
--- a/public/stylesheets/instiki.css
+++ b/public/stylesheets/instiki.css
@@ -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,14 +381,27 @@ 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;
+.web_protected a.existingWikiWord[title], .web_normal a.existingWikiWord[title] {
+// border: none;
 }
 
-a:hover,a.nav:hover, a:hover math {
+a:hover, a.nav:hover, a:hover math {
+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;
 }