cleansed my werc stuff, removed crap, created a theme that will work well for s… | |
git clone git://git.suckless.org/swerc | |
Log | |
Files | |
Refs | |
README | |
--- | |
commit c29b110e53662136d885b3d1634e1c7d2250db55 | |
parent 36f71f8286299baa8c21712253c7981cf397d88a | |
Author: [email protected] <unknown> | |
Date: Sat, 4 Feb 2012 18:25:39 +0100 | |
cleansed my werc stuff, removed crap, created a theme that will work well for s… | |
Diffstat: | |
D apps/blagh/app.rc | 139 ------------------------------ | |
D apps/blagh/atom.tpl | 139 ------------------------------ | |
D apps/blagh/convert.rc | 20 -------------------- | |
D apps/blagh/new_post.tpl | 11 ----------- | |
D apps/blagh/rss20.tpl | 52 -----------------------------… | |
M bin/corehandlers.rc | 18 +++++++++--------- | |
D etc/users/GROUP_AND_USER_ACCOUNTS | 1 - | |
D lib/default_master-full.tpl | 45 -----------------------------… | |
M lib/default_master.tpl | 2 +- | |
M lib/headers.tpl | 2 +- | |
A pub/style.css | 123 +++++++++++++++++++++++++++++… | |
D pub/style/style.css | 123 -----------------------------… | |
D pub/style/style_full.css | 152 -----------------------------… | |
13 files changed, 134 insertions(+), 693 deletions(-) | |
--- | |
diff --git a/apps/blagh/app.rc b/apps/blagh/app.rc | |
@@ -1,139 +0,0 @@ | |
-fn conf_enable_blog { | |
- blagh_uri=$conf_wd | |
- blagh_dirs=$* | |
- if(~ $#blagh_dirs 0) | |
- blagh_dirs=( . ) | |
- conf_enable_app blagh | |
- | |
- if(~ $"conf_blog_editors '') | |
- conf_blog_editors=blog-editors | |
- | |
- if(~ $"conf_max_posts_per_page '') | |
- conf_max_posts_per_page=32 | |
-} | |
- | |
-fn blagh_init { | |
- if(~ $#blagh_dirs 0 && ~ $req_path */[bB]log/*) { | |
- blagh_uri=`{echo $req_path | sed 's,(/[bB]log/).*,\1,'} | |
- blagh_dirs=( . ) | |
- } | |
- | |
- # Should not match sub-dirs! | |
- if(! ~ $#blagh_dirs 0) { | |
- # && test -d / `{echo '-a -d '^$blagh_root^$blagh_dirs} | |
- blagh_url=$base_url^$blagh_uri | |
- blagh_root=$sitedir^$blagh_uri | |
- if(check_user $conf_blog_editors) { | |
- editor_mode=on | |
- if(~ $"post_arg_date '') | |
- post_date=`{/bin/date +%F|sed 's,-,/,g'} | |
- if not | |
- post_date=$post_arg_date | |
- ll_add handlers_bar_left echo '<a href="'$blagh_uri'new_post">Make… | |
- } | |
- | |
- if(~ $req_path $blagh_uri) { | |
- handler_body_main=blagh_body | |
- u=$blagh_uri'index' | |
- extraHeaders=$"extraHeaders ^ \ | |
-'<link rel="alternate" type="application/atom+xml" title="ATOM" href="'$"u'.at… | |
-<link rel="alternate" type="application/rss+xml" title="RSS" href="'$"u'.rss" … | |
- } | |
- if not if(~ $req_path $blagh_uri^index.atom) | |
- blagh_setup_feed_handlers atom.tpl 'application/atom+xml' | |
- | |
- if not if(~ $req_path $blagh_uri^index.rss) | |
- blagh_setup_feed_handlers rss20.tpl 'text/xml; charset=utf-8' | |
- | |
- if not if(~ $req_path $blagh_uri^new_post && ! ~ $#editor_mode 0) { | |
- handler_body_main=( tpl_handler `{get_lib_file blagh/new_post.tpl … | |
- if(~ $REQUEST_METHOD POST) { | |
- if(mkbpost $"post_arg_body $"post_date $"post_arg_title $post_… | |
- post_redirect $blagh_uri | |
- if not | |
- notify_errors=$status | |
- } | |
- } | |
- | |
- } | |
-} | |
- | |
-fn blagh_setup_feed_handlers { | |
- handler_body_main=NOT_USED_by_blagh_feeds | |
- res_tail=() | |
- http_content_type=$2 | |
- headers=() | |
- master_template=apps/blagh/$1 # Should we allow tempalte override? | |
-} | |
- | |
-fn blagh_body { | |
- if (! ~ $"blogTitle '') | |
- echo '<h1>'$"blogTitle'</h1>' | |
- | |
- # Direct links to feeds are disabled because they are not very useful, add… | |
- # 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 … | |
- | |
- { # XXX Not sure why this fixes issues with blog setup, probably bug in fl… | |
- 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… | |
- sed '1s!.*^') ('^$l(1)^')!' < $p/index.md | |
- echo # Needed extra \n so markdown doesn't mess up the formatting, pro… | |
- } | |
- # XXX BUG! Markdown [references] break because multiple markdown documents… | |
- # TODO: use fltr_cache directly, that can fix the previous bug plus provid… | |
- } | $formatter | |
-} | |
- | |
-fn get_post_list { | |
- # /./->/|/ done to sort -t| and order by date | |
- # Note: $paths in blagh_dirs should not contain '/./' or '|' | |
- ls -F $*^/./[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]/ >[2]/dev/null | se… | |
-} | |
- | |
-fn mkbpost { | |
- bptext=$1 | |
- bpdate=$2 | |
- bptitle=$3 | |
- bpid=$4 | |
- _status=() | |
- if(~ $"bptext '') | |
- _status=($_status 'You need to provide a post body.') | |
- if(! ~ $"bpdate [0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]) | |
- _status=($_status 'Invalid date: '''^$"bpdate^'''') # XXX Should make … | |
- | |
- if(~ $#_status 0) { | |
- umask 002 # Let group write | |
- if(! ~ $"bpid '') | |
- bpid=`{echo -n '-'^$bpid | sed 's/'$forbidden_uri_chars'+/_/g; 1q'} | |
- | |
- ddir=$blagh_root^$bpdate^'/' | |
- n=`{ls $ddir >[2]/dev/null |wc -l} | |
- | |
- mkdir -p $ddir/$"n^$"bpid/ | |
- { | |
- if(! ~ $"bptitle '') { | |
- echo $bptitle | |
- echo '=========================================' | |
- } | |
- # TODO: Enable metadata | |
- #echo '* Posted:' `{date} | |
- #if(! ~ $#logged_user 0) | |
- # echo '* Author: '$logged_user | |
- echo | |
- echo $bptext | |
- }> $ddir/$"n^$"bpid/index.md | |
- | |
- # Experimental support for http://pubsubhubbub.googlecode.com/ | |
- if(! ~ $"conf_blog_pubsubdub_hub '') { | |
- ifs='' { p=`{echo $req_url|sed 's/new_post$/index.atom/'|url_encod… | |
- dprint hget -p 'hub.mode=publish&hub.url='^$"p $conf_blog_pubsubdu… | |
- hget -d -h -p 'hub.mode=publish&hub.url='^$"p $conf_blog_pubsubdub… | |
- } | |
- } | |
- status=$_status | |
-} | |
- | |
-fn strip_title_from_md_file { | |
- sed '1N; /^.*\n===*$/N; /.*\n===*\n$/d' | |
-} | |
diff --git a/apps/blagh/atom.tpl b/apps/blagh/atom.tpl | |
@@ -1,139 +0,0 @@ | |
-<?xml version="1.0" encoding="utf-8"?> | |
- | |
-%{ | |
-# See for more info:http://www.tbray.org/ongoing/When/200x/2005/07/27/Atomic-R… | |
-fn statpost { | |
- f = $1 | |
- | |
- updated = `{/bin/date --rfc-3339'=seconds' -r $f |tr ' ' 'T'} | |
- post_uri=$base_url^`{cleanname `{echo $f | sed -e 's!^'$sitedir'!!'}}^'/' | |
- title=`{read $f/index.md} | |
- # Not used: date=`{/bin/date -Rd `{basename $f |sed 's/(^[0-9\-]*).*/\1/; … | |
- # TODO: use mtime(1) and ls(1) instead of lunix's stat(1) | |
- stat=`{stat -c '%Y %U' $f} | |
- #mdate=`{/bin/date -Rd `{mtime $f|awk '{print $1}' }} # Not used because i… | |
- by=$stat(2) | |
- #ifs=() { summary=`{cat $f/index.md | crop_text 1024 ... | $formatter } } | |
- ifs=() { summary=`{cat $f/index.md | strip_title_from_md_file | ifs=$difs … | |
-} | |
-updated = `{/bin/date --rfc-3339'=seconds' |sed 's/ /T/'} | |
-%} | |
- | |
-<feed xmlns="http://www.w3.org/2005/Atom" | |
- xmlns:thr="http://purl.org/syndication/thread/1.0"> | |
- | |
-% if(! ~ $"conf_blog_pubsubdub_hub '') { | |
-% echo '<link rel="hub" href="'$conf_blog_pubsubdub_hub'" />' | |
-% } | |
- | |
- <link rel="self" href="%($base_url^$req_path%)"/> | |
- <id>%($base_url^$req_path%)</id> | |
- <icon>/favicon.ico</icon> | |
- | |
- <title>%($siteTitle%)</title> | |
- <subtitle>%($siteSubTitle%)</subtitle> | |
- | |
-% # <updated>2008-09-24T12:47:00-04:00</updated> | |
- <updated>%($updated%)</updated> | |
- <link href="."/> | |
- | |
-% for(f in `{get_post_list $blagh_root$blagh_dirs}) { | |
-% statpost $f | |
- | |
- <entry> | |
-% # Maybe we should be smarter, see: http://diveintomark.org/archives/2004/05/… | |
- <id>%($post_uri%)</id> | |
- <link href="%($post_uri%)"/> | |
- <title>%($title%)</title> | |
-% # <link rel="replies" href="2899.atom" thr:count="0"/> | |
- <author><name>%($by%)</name></author> | |
- | |
- | |
- <content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"> | |
- %($summary%) | |
- </div></content> | |
- | |
- <updated>%($updated%)</updated> | |
- </entry> | |
- | |
-% } | |
- | |
-</feed> | |
- | |
-% exit | |
- | |
-<feed xmlns="http://www.w3.org/2005/Atom" | |
- xmlns:thr="http://purl.org/syndication/thread/1.0"> | |
- <link rel="self" href="http://intertwingly.net/blog/index.atom"/> | |
- <id>http://intertwingly.net/blog/index.atom</id> | |
- <icon>../favicon.ico</icon> | |
- | |
- <title>Sam Ruby</title> | |
- <subtitle>It’s just data</subtitle> | |
- <author> | |
- <name>Sam Ruby</name> | |
- <email>[email protected]</email> | |
- <uri>/blog/</uri> | |
- </author> | |
- <updated>2008-09-24T12:47:00-04:00</updated> | |
- <link href="/blog/"/> | |
- <link rel="license" href="http://creativecommons.org/licenses/BSD/"/> | |
- | |
- <entry> | |
- <id>tag:intertwingly.net,2004:2899</id> | |
- <link href="/blog/2008/09/11/RubyConf-2008"/> | |
- <link rel="replies" href="2899.atom" thr:count="0"/> | |
- <title>RubyConf 2008</title> | |
- <content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"> | |
- | |
-<p>My <a href="http://www.rubyconf.org/talks/14">proposal</a> has been accepte… | |
-<p>I had originally requested a slot on Saturday. My current slot requires m… | |
- | |
- </div></content> | |
- <updated>2008-09-11T06:51:36-04:00</updated> | |
- </entry> | |
- | |
- <entry> | |
- <id>tag:intertwingly.net,2004:2898</id> | |
- <link href="/blog/2008/09/10/Small-Updates"/> | |
- <link rel="replies" href="2898.atom" thr:count="8" thr:updated="2008-09-10… | |
- <title>Small Updates</title> | |
- <summary type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"> | |
- | |
- <p><a href="http://hublog.hubmed.org/archives/001744.html">Alf Eaton</a>: … | |
-<p>I don’t know what publishing software you use, but I see you provide an A… | |
- | |
- </div></summary> | |
- <content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"> | |
- | |
-<p><a href="http://hublog.hubmed.org/archives/001744.html"><cite>Alf Eaton</ci… | |
-<p>I don’t know what publishing software you use, but I see you provide an A… | |
-<p>More specifically, if you have a minor update and leave the updated date al… | |
- | |
- </div></content> | |
- <updated>2008-09-10T10:18:47-04:00</updated> | |
- </entry> | |
- | |
- <entry> | |
- <id>tag:intertwingly.net,2004:2897</id> | |
- <link href="/blog/2008/09/07/SVG-via-CSS"/> | |
- <link rel="replies" href="2897.atom" thr:count="10" thr:updated="2008-09-1… | |
- <title>SVG via CSS</title> | |
- <summary type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"> | |
- | |
- <p>Now that I have my weblog looking reasonably consistent between Gecko a… | |
-<p>Frankly, my first reaction to this was mixed. The pluses for SVG in CSS i… | |
- | |
- </div></summary> | |
- | |
- <content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"> | |
- | |
-<p>Now that I have my weblog looking reasonably consistent between Gecko and W… | |
-<p>Meanwhile, Robert O’Callahan has been exploring <a href="http://weblogs.m… | |
- | |
- </div></content> | |
- <updated>2008-09-07T11:12:29-04:00</updated> | |
- </entry> | |
- | |
-</feed> | |
- | |
diff --git a/apps/blagh/convert.rc b/apps/blagh/convert.rc | |
@@ -1,20 +0,0 @@ | |
-#!/usr/bin/env rc | |
- | |
-path=($PLAN9/bin/ $path) | |
- | |
-for(p in *.md) { | |
- echo | |
- echo '=========================' | |
- echo p $p | |
- pp=`{echo $p | sed 's/^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])[\-… | |
- echo pp $pp | |
- | |
- d=$pp(1)^'/'^$pp(2)^'/'^$pp(3)^'/'^$pp(4)^'/' | |
- | |
- mkdir -p $d | |
- echo $pp(4) | sed -e 's/^[0-9]_//; s/_/ /g;' > $d/index.md | |
- echo '=================================' >> $d/index.md | |
- echo >> $d/index.md | |
- cat $p >> $d/index.md | |
- | |
-} | |
diff --git a/apps/blagh/new_post.tpl b/apps/blagh/new_post.tpl | |
@@ -1,11 +0,0 @@ | |
-<div> | |
-% notices_handler | |
-<form method="POST"><fieldset> | |
- <legend>Submit a new blog post</legend> | |
- <textarea cols="94" rows=16" name="body">%($"post_arg_body%)</textarea><br… | |
- <label>Title: <input size="64" type="text" name="title" value="%($"post_ar… | |
- <label>Id: <input size="8" type="text" name="id" value="%($"post_arg_id%)"… | |
- <label>Date: <input size="10" maxlength="10" type="text" name="date" value… | |
- <input type="submit" value="Post" /> | |
-</fieldset></form> | |
-</div> | |
diff --git a/apps/blagh/rss20.tpl b/apps/blagh/rss20.tpl | |
@@ -1,52 +0,0 @@ | |
-<?xml version="1.0" encoding="UTF-8"?> | |
- | |
-%{ | |
-fn statpost { | |
- f = $1 | |
- | |
- post_uri = `{echo $f | sed 's,^'$sitedir',,'} | |
- #title=`{basename $f | sed 's/^[0-9\-]*_(.*)\.md$/\1/; s/_/ /g' } | |
- title=`{read $f/index.md} | |
- date=`{/bin/date -Rd `{echo $f|sed 's,.*/([0-9][0-9][0-9][0-9]/[0-9][0-9]/… | |
- # TODO: use mtime(1) and ls(1) instead of lunix's stat(1) | |
- stat=`{stat -c '%Y %U' $f} | |
- #mdate=`{/bin/date -Rd $stat(1)} # Not used because it is unreliable | |
- post_uri=$base_url^`{cleanname `{echo $f | sed -e 's!^'$sitedir'!!'}}^'/' | |
- by=$stat(2) | |
- ifs=() {summary=`{ cat $f/index.md |strip_title_from_md_file| ifs=$difs {$… | |
-} | |
- | |
-%} | |
- | |
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> | |
- <channel> | |
- <atom:link href="%($base_url^$req_path%)" rel="self" type="application… | |
- <title>%($siteTitle%)</title> | |
- <link>%($base_url^$req_path%)</link> | |
- <description>%($blogDesc%)</description> | |
- <language>en-us</language> | |
- <generator>Tom Duff's rc, and Kris Maglione's clever hackery</generato… | |
-%{ | |
- # <webMaster>[email protected] (Uriel)</webMaster> | |
- for(f in `{get_post_list $blagh_root$blagh_dirs}) { | |
- statpost $f | |
- # Hack to aproximate the last build date | |
- #(use the mdate from last posted item) | |
- # Commented out for now because maybe a wrong value is worse than … | |
- #if(~ $#last_build_date 0) { | |
- #last_build_date='<lastBuildDate>'^$"mdate'</lastBuildDate>' | |
- #echo $last_build_date | |
- #} | |
-%} | |
- <item> | |
- <title>%($title%)</title> | |
- <author>%($by%)@noreply.cat-v.org (%($by%))</author> | |
- <link>%($post_uri%)</link> | |
- <guid isPermaLink="true">%($post_uri%)</guid> | |
- <pubDate>%($date%)</pubDate> | |
- <description>%($summary%)</description> | |
- </item> | |
-% } | |
- | |
- </channel> | |
-</rss> | |
diff --git a/bin/corehandlers.rc b/bin/corehandlers.rc | |
@@ -1,10 +1,12 @@ | |
# Werc builtin handlers | |
fn nav_tree { | |
+ if(! ~ $#sideBarNavTitle 0) | |
+ echo '<p class="sideBarTitle">'$"sideBarNavTitle':</p>' | |
echo '<ul>' | |
if(~ $"req_paths_list /) | |
- echo '<li><a href="/" class="current">Home</a></li>' | |
+ echo '<li><a href="/" class="thisPage">Home</a></li>' | |
if not | |
echo '<li><a href="/">Home</a></li>' | |
# Ignore stderr, last path element might be a file that doesn't exist (eg.… | |
@@ -15,15 +17,15 @@ fn nav_tree { | |
if(! ~ $#synth_paths 0) echo $synth_paths | tr ' ' $NEW_LINE | |
} | sort -u | awk -F/ ' | |
function p(x, y, s) { for(i=0; i < x-y; i+=1) print s } | |
- BEGIN { lNF=2; } | |
+ BEGIN { lNF=2; print "<ul>" } | |
{ | |
d = "" | |
if(match($0, "/$")) | |
d = "/" | |
sub("/$", "") # Strip trailing / for dirs so NF is consistent | |
- print "<li>"; | |
- p(NF, lNF, " ") | |
+ p(NF, lNF, "<li><ul>") | |
+ p(lNF, NF, "</ul></li>") | |
lNF = NF | |
bname = $NF d | |
@@ -35,13 +37,11 @@ fn nav_tree { | |
gsub(/[^\/]$/, "&/", pa) | |
if(index(ENVIRON["req_path"] "/", pa) == 1) | |
- print "<a href=\"" path "\" class=\"current\">" bname "</a>" | |
+ print "<li><a href=\"" path "\" class=\"thisPage\"> " bname "</a><… | |
else | |
- print "<a href=\"" path "\">" bname "</a>" | |
- | |
- print "</li>" | |
+ print "<li><a href=\"" path "\">" bname "</a></li>" | |
} | |
- END { print "</ul>" }' | |
+ END { p(lNF, 2, "</ul></li>"); print "</ul>" }' | |
} | |
fn link_bar { | |
diff --git a/etc/users/GROUP_AND_USER_ACCOUNTS b/etc/users/GROUP_AND_USER_ACCOU… | |
@@ -1 +0,0 @@ | |
-This is just a dummy file to force hg to preserve this directory that is used … | |
diff --git a/lib/default_master-full.tpl b/lib/default_master-full.tpl | |
@@ -1,45 +0,0 @@ | |
-<!-- | |
- <div id="offsite"> | |
- <a class="current" href="http://garbe.us">Home</a> | |
- <a href="http://blog.garbe.us">Blog</a> | |
- </div> | |
---> | |
- | |
- <div id="innerbody"> | |
- | |
- <div id="header"> | |
- <a href="/">%($"siteTitle%) <span id="headerSubTitle">%($"site… | |
- </div> | |
- | |
- <div id="content"> | |
-% if(! ~ $#handlers_bar_left 0) { | |
- <div id="nav"> | |
-% for(h in $handlers_bar_left) { | |
-% run_handler $$h | |
-% } | |
- </div> | |
-% } | |
- | |
- <div id="main"> | |
- | |
-% run_handlers $handlers_body_head | |
- | |
-% run_handler $handler_body_main | |
- | |
-% run_handlers $handlers_body_foot | |
- | |
- </div> | |
- </div> | |
- | |
- <div id="footer"> | |
- <div class="left"> | |
- <a href="http://werc.cat-v.org/">Powered by werc</a> | |
- </div> | |
- <div class="right"> | |
- © 2011 Anselm R Garbe | |
- </div> | |
- </div> | |
- | |
- </div> | |
-</body> | |
-</html> | |
diff --git a/lib/default_master.tpl b/lib/default_master.tpl | |
@@ -27,6 +27,6 @@ | |
<a href="http://werc.cat-v.org/">Powered by werc</a> | |
</div> | |
<div class="right"> | |
- © 2011 Anselm R Garbe | |
+ © 2012 Anselm R Garbe | |
</div> | |
</div> | |
diff --git a/lib/headers.tpl b/lib/headers.tpl | |
@@ -3,6 +3,6 @@ | |
<head> | |
<title>%($pageTitle%)</title> | |
<link href='http://fonts.googleapis.com/css?family=Cantarell' rel='sty… | |
- <link rel="stylesheet" href="/pub/style/style.css" type="text/css"> | |
+ <link rel="stylesheet" href="/pub/style.css" type="text/css"> | |
<meta charset="utf-8"> | |
</head> | |
diff --git a/pub/style.css b/pub/style.css | |
@@ -0,0 +1,123 @@ | |
+body { | |
+ background-color: #eee; | |
+ color: #333; | |
+ font-family: Cantarell, Helvetica, Verdana, Arial, 'Liberation Sans', … | |
+ text-align: justify; | |
+ padding: 0; | |
+ margin: 0; | |
+} | |
+ | |
+a { | |
+ color: #36c; | |
+ text-decoration: none; | |
+} | |
+ | |
+a:hover { | |
+ color: #666; | |
+} | |
+ | |
+#header { | |
+ clear: both; | |
+ color: #666; | |
+ text-shadow: 1px 1px #fff; | |
+ font-size: 1.7em; | |
+ padding: 0.7ex; | |
+} | |
+ | |
+#header a { | |
+ color: #666; | |
+} | |
+ | |
+h1 { | |
+ margin: 1em 1ex 0.5ex 0; | |
+ font-size: 1.4em; | |
+} | |
+ | |
+h2 { | |
+ margin: 1em 1ex 0.5ex 0; | |
+ font-size: 1.3em; | |
+} | |
+ | |
+h3 { | |
+ margin: 1em 1ex 0.5ex 0; | |
+ font-size: 1.2em; | |
+} | |
+ | |
+h4 { | |
+ margin: 1em 1ex 0.5ex 0; | |
+ font-size: 1.1em; | |
+} | |
+ | |
+#content { | |
+ clear: both; | |
+ margin: 0; | |
+ padding: 0; | |
+ background-color: #fff; | |
+ overflow: hidden; | |
+ border-top: 1px solid #ccc; | |
+ border-bottom: 1px solid #ccc; | |
+} | |
+ | |
+#nav { | |
+ background-color: #fff; | |
+ float: left; | |
+ margin: 0 1px 0 0; | |
+ padding: 0; | |
+ border-right: 1px solid #ccc; | |
+ width: 200px; | |
+} | |
+ | |
+#nav ul { | |
+ margin: 0; | |
+ padding: 0; | |
+} | |
+ | |
+#nav li { | |
+ list-style: none; | |
+ padding: 0; | |
+ margin: 0; | |
+} | |
+ | |
+#nav li ul { | |
+ padding-left: 0.6em !important; | |
+} | |
+ | |
+#nav li a { | |
+ color: #36c; | |
+ display: block; | |
+ margin: 0; | |
+ padding: 0.8ex 2em 0.8ex 1em; | |
+} | |
+ | |
+#nav li a:hover { | |
+ background: #eee; | |
+} | |
+ | |
+#nav li a.thisPage { | |
+ color: #333; | |
+ font-weight: bold; | |
+ font-style: italic; | |
+} | |
+ | |
+#main { | |
+ margin: 0 0 0 200px; | |
+ padding: 1.5em 1em 1.5em 2em; | |
+ max-width: 50em; | |
+ border-left: 1px solid #ccc; | |
+} | |
+ | |
+#footer { | |
+ clear: both; | |
+ color: #666; | |
+ font-size: 84%; | |
+ padding: 1em; | |
+ margin: 0 0 1.5em 0; | |
+} | |
+ | |
+.left { | |
+ float: left; | |
+} | |
+ | |
+.right { | |
+ float: right; | |
+} | |
diff --git a/pub/style/style.css b/pub/style/style.css | |
@@ -1,123 +0,0 @@ | |
-body { | |
- background-color: #eee; | |
- color: #333; | |
- font-family: Cantarell, Helvetica, Verdana, Arial, 'Liberation Sans', … | |
- text-align: justify; | |
- padding: 1em; | |
- margin: 0 auto 0 auto; | |
- max-width: 50em; | |
-} | |
- | |
-a { | |
- color: #36c; | |
- text-decoration: none; | |
-} | |
- | |
-a:hover { | |
- color: #666; | |
-} | |
- | |
-#header { | |
- clear: both; | |
- color: #666; | |
- text-shadow: 1px 1px #fff; | |
- font-size: 1.7em; | |
- padding: 0.7ex; | |
-} | |
- | |
-#header a { | |
- color: #666; | |
-} | |
- | |
-h1 { | |
- margin: 1em 1ex 0.5ex 0; | |
- font-size: 1.4em; | |
-} | |
- | |
-h2 { | |
- margin: 1em 1ex 0.5ex 0; | |
- font-size: 1.3em; | |
-} | |
- | |
-h3 { | |
- margin: 1em 1ex 0.5ex 0; | |
- font-size: 1.2em; | |
-} | |
- | |
-h4 { | |
- margin: 1em 1ex 0.5ex 0; | |
- font-size: 1.1em; | |
-} | |
- | |
-#content { | |
- padding: 0; | |
- margin: 1ex 0 0 0; | |
- border: 1px solid #ccc; | |
- /* | |
- -moz-box-shadow: 0 0 0.7ex #999; | |
- -webkit-box-shadow: 0 0 0.7ex #999; | |
- box-shadow: 0 0 0.7ex #999; | |
- */ | |
-} | |
- | |
-#nav { | |
- background-color: #ddd; | |
- float: right; | |
- margin: 0 0 2em 2em; | |
- padding: 0; | |
-} | |
- | |
-#nav ul { | |
- margin: 0; | |
- padding: 0; | |
-} | |
- | |
-#nav li { | |
- list-style: none; | |
- padding: 0; | |
- margin: 0; | |
- width: 100%; | |
-} | |
- | |
-#nav li a { | |
- color: #36c; | |
- display: block; | |
- margin: 0; | |
- padding: 0.8ex 2em 0.8ex 1em; | |
-} | |
- | |
-#nav li a:hover { | |
- background: #eee; | |
-} | |
- | |
-#nav li a.current { | |
- background-color: #fff; | |
- color: #333; | |
- /* | |
- -moz-box-shadow: 0.4ex 0.2ex 0.4ex #999; | |
- -webkit-box-shadow: 0.4ex 0.2ex 0.4ex #999; | |
- box-shadow: 0.4ex 0.2ex 0.4ex #999; | |
- */ | |
-} | |
- | |
-#main { | |
- align: left; | |
- background-color: #fff; | |
- padding: 5ex; | |
-} | |
- | |
-#footer { | |
- clear: both; | |
- color: #666; | |
- font-size: 84%; | |
- padding: 1ex; | |
- margin: 0 0 1em 0; | |
-} | |
- | |
-.left { | |
- float: left; | |
-} | |
- | |
-.right { | |
- float: right; | |
-} | |
diff --git a/pub/style/style_full.css b/pub/style/style_full.css | |
@@ -1,152 +0,0 @@ | |
-body { | |
- background-color: #eee; | |
- color: #333; | |
- font-family: Cantarell, Helvetica, Verdana, Arial, 'Liberation Sans', … | |
- text-align: justify; | |
- padding: 0; | |
- margin: 0; | |
-} | |
- | |
-a { | |
- color: #36c; | |
- text-decoration: none; | |
-} | |
- | |
-a:hover { | |
- color: #039; | |
-} | |
- | |
-#innerbody { | |
- padding: 1em; | |
- margin: 0 auto 0 auto; | |
- max-width: 50em; | |
-} | |
- | |
-#offsite { | |
- background-color: #ccc; | |
- padding: 0.5ex 0 0.5ex 0; | |
- margin: 0; | |
- -moz-box-shadow: 0 0 1ex #666; | |
- -webkit-box-shadow: 0 0 1ex #666; | |
- box-shadow: 0 0 1ex #666; | |
- text-align: center; | |
- font-size: 84%; | |
-} | |
- | |
-#offsite a { | |
- margin: 0; | |
- padding: 0.5ex 1em 0.5ex 1em; | |
-} | |
- | |
-#offsite a:hover { | |
- color: #36c; | |
- background-color: #ddd; | |
-} | |
- | |
-#offsite a.current { | |
- background-color: #eee; | |
- color: #333; | |
- -moz-box-shadow: 0 0 0.5ex #fff; | |
- -webkit-box-shadow: 0 0 0.5ex #fff; | |
- box-shadow: 0 0 0.5ex #fff; | |
-} | |
- | |
-#header { | |
- clear: both; | |
- color: #666; | |
- text-shadow: 1px 1px #fff; | |
- font-size: 1.7em; | |
- padding: 0.7ex; | |
-} | |
- | |
-#header a, a:hover { | |
- color: #666; | |
-} | |
- | |
-h1 { | |
- margin: 1em 1ex 0.5ex 0; | |
- font-size: 1.4em; | |
-} | |
- | |
-h2 { | |
- margin: 1em 1ex 0.5ex 0; | |
- font-size: 1.3em; | |
-} | |
- | |
-h3 { | |
- margin: 1em 1ex 0.5ex 0; | |
- font-size: 1.2em; | |
-} | |
- | |
-h4 { | |
- margin: 1em 1ex 0.5ex 0; | |
- font-size: 1.1em; | |
-} | |
- | |
-#content { | |
- padding: 0; | |
- margin: 1ex 0 0 0; | |
- -moz-box-shadow: 0 0 0.7ex #999; | |
- -webkit-box-shadow: 0 0 0.7ex #999; | |
- box-shadow: 0 0 0.7ex #999; | |
-} | |
- | |
-#nav { | |
- background-color: #ddd; | |
- float: right; | |
- margin: 0 0 2em 2em; | |
- padding: 0; | |
-} | |
- | |
-#nav ul { | |
- margin: 0 0 1ex 0; | |
- padding: 0; | |
-} | |
- | |
-#nav li { | |
- list-style: none; | |
- padding: 0; | |
- margin: 0; | |
- width: 100%; | |
-} | |
- | |
-#nav li a { | |
- color: #36c; | |
- display: block; | |
- margin: 0; | |
- padding: 0.8ex 2em 0.8ex 1em; | |
-} | |
- | |
-#nav li a:hover { | |
- background: #eee; | |
-} | |
- | |
-#nav li a.current { | |
- background-color: #fff; | |
- color: #333; | |
- -moz-box-shadow: 0.3ex 0.3ex 0.3ex #999; | |
- -webkit-box-shadow: 0.3ex 0.3ex 0.3ex #999; | |
- box-shadow: 0.3ex 0.3ex 0.3ex #999; | |
-} | |
- | |
-#main { | |
- align: left; | |
- background-color: #fff; | |
- padding: 5ex; | |
-} | |
- | |
-#footer { | |
- clear: both; | |
- color: #666; | |
- font-size: 84%; | |
- padding: 1ex; | |
- margin: 0 0 1em 0; | |
-} | |
- | |
-.left { | |
- float: left; | |
-} | |
- | |
-.right { | |
- float: right; | |
-} |