Merge branch 'master' of ssh://localhost:2222/~wmoore/Source/wezm.net

This commit is contained in:
Wesley Moore 2010-01-27 20:59:37 +11:00
commit cb7886b226
2 changed files with 4 additions and 2 deletions

View file

@ -1,8 +1,10 @@
<div id="header"> <div id="header">
<a href="/">WezM<sup>.net</sup></a> <a href="/">WezM<sup>.net</sup></a>
<ul id="menu" class="inline"> <ul id="menu" class="inline">
<li><a href="/articles/">Articles</a></li> <li><a href="/articles/">Archive</a></li>
<li><a href="/about/">Contact</a></li>
<li><a href="/about/">About</a></li> <li><a href="/about/">About</a></li>
<li><a href="/about/">Projects</a></li>
<li> <li>
<a href="<%= feed_url %>"><img src="/images/white-feed-icon.png" width="12" height="12" /></a> <a href="<%= feed_url %>"><img src="/images/white-feed-icon.png" width="12" height="12" /></a>
<a href="<%= feed_url %>">Feed</a> <a href="<%= feed_url %>">Feed</a>

View file

@ -192,7 +192,7 @@ ul#menu li {
clear: both; clear: both;
} }
#flickr li img { #flickr li img {
opacity: 0.5; opacity: 0.7;
} }
#flickr li img:hover { #flickr li img:hover {
opacity: 1; opacity: 1;