summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jeremiah Dow <jeremdow@gmail.com> 2011-03-31 22:20:06 -0400
committerGravatar Jeremiah Dow <jeremdow@gmail.com> 2011-03-31 22:20:06 -0400
commit9485c7eeb1fd0c05f46eb13767086d1e9fa73e92 (patch)
tree6df69e96d4db7158c9d4b362623b87e0b0fc3094
parent98a83f836dbb4551c7f2b3d025c0123c4ac86bfe (diff)
downloadjeremdow.us-9485c7eeb1fd0c05f46eb13767086d1e9fa73e92.tar.gz
cleanup to stay closer to head
-rw-r--r--apps/blagh/app.rc3
-rw-r--r--sites/jeremdow.com/_werc/lib/default_master.tpl8
-rw-r--r--sites/jeremdow.com/_werc/lib/footer.inc3
-rw-r--r--sites/jeremdow.com/_werc/pub/style.css30
4 files changed, 23 insertions, 21 deletions
diff --git a/apps/blagh/app.rc b/apps/blagh/app.rc
index 9773fed..bc4149d 100644
--- a/apps/blagh/app.rc
+++ b/apps/blagh/app.rc
@@ -73,12 +73,11 @@ fn blagh_body {
# Direct links to feeds are disabled because they are not very useful, add clutter and might waste pagerank.
# An user can add this on their own using handlers_body_head anyway.
#echo '<div style="text-align:right">(<a href="index.rss">RSS Feed</a>|<a href="index.atom">Atom Feed</a>)</div>'
- echo '<p><a class="feed" target="blank" href="http://feeds.feedburner.com/jeremdow"><img alt="Subscribe in a reader" src="http://jeremdow.com/_images/feed-icon16x16.png" /></a></p>'
{ # XXX Not sure why this fixes issues with blog setup, probably bug in fltr_cache!
for(p in `{get_post_list $blagh_root^$blagh_dirs}) {
l=`{echo -n $p|sed 's!'$sitedir^'/?(.*)([0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9])(/[^/]+/)!\2 /\1\2\3!'}
- sed '1s!.*![&]('^$l(2)^') <span class="date">'^$l(1)^'</span>!' < $p/index.md | sed 's/^=.*/---------------------/'
+ sed '1s!.*![&]('^$l(2)^') <span class="date">'^$l(1)^'</span>!' < $p/index.md
echo # Needed extra \n so markdown doesn't mess up the formatting, probably can be done in sed.
}
# XXX BUG! Markdown [references] break because multiple markdown documents are merged. Should format each blog post independently.
diff --git a/sites/jeremdow.com/_werc/lib/default_master.tpl b/sites/jeremdow.com/_werc/lib/default_master.tpl
index 67bb8db..6cf519a 100644
--- a/sites/jeremdow.com/_werc/lib/default_master.tpl
+++ b/sites/jeremdow.com/_werc/lib/default_master.tpl
@@ -2,7 +2,6 @@
% cat `{ get_lib_file top_bar.inc }
<div id="search">
- <p></p>
<form action="http://www.google.com/cse" id="cse-search-box">
<div>
<input type="hidden" name="cx" value="003190056917202029185:vgjg7tvaiom" />
@@ -15,20 +14,21 @@
</div>
<div class="midHeader">
- <div class="left">
<h1 class="headerTitle"><a href="/">%($"siteTitle%) <span id="headerSubTitle">%($"siteSubTitle%)</span></a></h1>
</div>
+ <div class="subHeader"><br></div>
</div>
-<div class="menu">
% if(! ~ $#handlers_bar_left 0) {
+ <div id="menu">
% for(h in $handlers_bar_left) {
+ <div>
% run_handler $$h
+ </div>
% }
</div>
% }
-</div>
<div id="main-copy">
diff --git a/sites/jeremdow.com/_werc/lib/footer.inc b/sites/jeremdow.com/_werc/lib/footer.inc
index 0e0fbf5..ee126cc 100644
--- a/sites/jeremdow.com/_werc/lib/footer.inc
+++ b/sites/jeremdow.com/_werc/lib/footer.inc
@@ -4,6 +4,9 @@
<p>
&copy; 2006-2011 Jeremiah Dow | <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA</a>
</p>
+ <p>
+ <a class="feed" target="blank" href="http://feeds.feedburner.com/jeremdow"><img alt="Subscribe in a reader" src="http://jeremdow.com/_images/feed-icon16x16.png" /></a>
+ </p>
</div>
<div class="left">
diff --git a/sites/jeremdow.com/_werc/pub/style.css b/sites/jeremdow.com/_werc/pub/style.css
index acbdaf6..10d1d4c 100644
--- a/sites/jeremdow.com/_werc/pub/style.css
+++ b/sites/jeremdow.com/_werc/pub/style.css
@@ -69,7 +69,7 @@ a:hover { text-decoration: underline; }
/* new horiz menu stuff # */
-.menu {
+#menu {
width: 100%;
clear: both;
border: 0;
@@ -77,23 +77,23 @@ a:hover { text-decoration: underline; }
padding: 0;
}
-.menu ul {
+#menu ul {
background-color: #edece6;
}
-.menu ul ul {
+#menu ul ul {
position: absolute;
top: 6.2em;
left: 1ex;
background-color: #ffffff;
}
-.menu ul ul ul {
+#menu ul ul ul {
position: static;
display: none;
}
-.menu ul {
+#menu ul {
margin: 0;
padding: 0 0.3em;
list-style-type: none;
@@ -101,24 +101,18 @@ a:hover { text-decoration: underline; }
border: 0;
}
-.menu li {
+#menu li {
display: inline;
white-space: nowrap;
line-height: 1.6em;
}
-.thisPage, .thisPage a {
- color: black!important;
- background-color: transparent;
- padding-left: 0;
-}
-
-.menu li.thisPage a {
+#menu li.thisPage a {
color: black!important;
font-weight: bold;
}
-.menu ul li a {
+#menu ul li a {
margin: 0;
padding: 0.1em 1ex;
color: #336699;
@@ -127,12 +121,18 @@ a:hover { text-decoration: underline; }
font-size: 1em;
border: 0;
}
-.menu ul li a:hover {
+#menu ul li a:hover {
color: black;
text-decoration: none;
text-transform: none;
}
+.thisPage, .thisPage a {
+ color: black!important;
+ background-color: transparent;
+ padding-left: 0;
+}
+
/* # Main Copy # */
#main-copy {
max-width: 70em;