From: Gabriel Dunne Date: Sun, 24 Jan 2010 08:31:32 +0000 (-0800) Subject: style, etc X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=6d6a0c60e3cd3b21ddd7326a512fd06942125c1c;p=plog_bk.git style, etc --- diff --git a/css/style.css b/css/style.css index ec06463..2e11517 100644 --- a/css/style.css +++ b/css/style.css @@ -19,7 +19,7 @@ h1, h2, h3, h4, h5, h6 { color:#444; font-size:1em; } h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { background:#ffe; } h1 { margin:0 0 3em 0; } h2 { margin:4em 0 0.5em 0; } -h3 { font-size:1em; margin:0; } +h3 { font-size:1em; margin:0; margin-bottom:0.5em; } /*code pre, .code { font-family: Monaco, monospace; font-size:11px; line-height:1.4em; background:#212121; color:#0f4; padding:1em 2em; } diff --git a/index.php b/index.php index cd3e07d..9a64b05 100644 --- a/index.php +++ b/index.php @@ -24,7 +24,6 @@ } } - header ( "Location: /img/" ); include ( TEMPLATE_DIR . 'index.html' ); ?> diff --git a/js/prettify/prettify.css b/js/prettify/prettify.css index 7ab26c6..f150b38 100755 --- a/js/prettify/prettify.css +++ b/js/prettify/prettify.css @@ -1,7 +1,7 @@ /* Pretty printing styles. Used with prettify.js. */ -.str { color: #f28; } -.kwd { color: #008; } +.str { color: #f26; } +.kwd { color: #000; font-weight:bold; } .com { color: #888; font-style:italic; } .typ { color: #606; } .lit { color: #066; } @@ -11,7 +11,7 @@ .atn { color: #606; } .atv { color: #080; } .dec { color: #606; } -pre.prettyprint, code.prettyprint { font-family:monaco, monospace; padding:2px 20px; background:#eee; } +pre.prettyprint, code.prettyprint { font-family:monospace; font-size:11px; padding:2px 20px; background:#f0f0f0; } pre.prettyprint { padding:20px; } @media print { diff --git a/lib/output.php b/lib/output.php index 2d82d83..14a8673 100644 --- a/lib/output.php +++ b/lib/output.php @@ -93,6 +93,7 @@ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); $feed = curl_exec($ch); curl_close($ch); + $xml = new SimpleXMLElement($feed); return $xml; } diff --git a/templates/agg.html b/templates/agg.html index bf71060..2dea6e8 100644 --- a/templates/agg.html +++ b/templates/agg.html @@ -77,15 +77,32 @@ - -

bookmarks

+ +

bookmarks

diff --git a/templates/index.html b/templates/index.html index 827ed4c..eea502f 100644 --- a/templates/index.html +++ b/templates/index.html @@ -12,5 +12,9 @@ +
+ projects, process log, experiments, code, reference, inspiration, aggregate +
+ - \ No newline at end of file + diff --git a/templates/links.html b/templates/links.html index d1a8d1c..94bfa6c 100644 --- a/templates/links.html +++ b/templates/links.html @@ -25,28 +25,35 @@ } $people = array( -// array('http://aaronkoblin.com', 'aaron koblin'), -// array('http://universaloscillation.com', 'aaron meyers'), - array('http://ripevessel.com', 'adam roth'), -// array('http://reas.com/', 'casey reas'), -// array('http://cenizal.com', 'cj cenizal'), + + array('http://onecm.com', 'ryan alexander'), + array('http://ssherriff.com', 'stephanie sherriff'), array('http://www.oddsympathy.com/', 'daniel massey'), - array('http://davidrager.org', 'david rager'), + array('http://pohflepp.com', 'sascha pohflepp'), + array('http://dabkitsch.com/jml', 'jeff lubow'), + array('http://jtnimoy.net', 'joshua nimoy'), + array('http://keithpasko.com', 'keith pasko'), array('http://fredericeyl.de', 'frédéric eyl'), - array('http://dabkitsch.com/jml', 'jeff lubow'), - array('http://jtnimoy.net', 'joshua nimoy'), - array('http://keithpasko.com', 'keith pasko'), + array('http://ghost-hack.com', 'michael chang'), + array('http://aaronkoblin.com', 'aaron koblin'), + array('http://mylinhtrieu.com', 'mylinh trieu'), + array('http://renataraksha.com', 'renata raksha'), + array('http://universaloscillation.com', 'aaron meyers'), + + array('http://tom-carden.co.uk', 'tom carden'), + array('http://mike.teczno.com', 'michal migurski'), + + + array('http://ripevessel.com', 'adam roth'), + array('http://cenizal.com', 'cj cenizal'), + array('http://davidrager.org', 'david rager'), array('http://digitanalog.net', 'marc nimoy'), -// array('http://makaga.com', 'matthew gale'), - array('http://davidmichaeldunne.com', 'michael dunne'), - array('http://mike.teczno.com', 'michal migurski'), - array('http://mylinhtrieu.com', 'mylinh trieu'), -// array('http://renataraksha.com', 'renata raksha'), - array('http://onecm.com', 'ryan alexander'), - array('http://pohflepp.com', 'sascha pohflepp'), - array('http://ssherriff.com', 'stephanie sherriff'), + array('http://makaga.com', 'matthew gale'), + + array(' ', ' '), + array('http://www.thegreeneyl.com/', 'the green eyl'), - array('http://tom-carden.co.uk', 'tom carden') + array('http://gaffta.org/', 'gaffta') ); ?> diff --git a/templates/nav.html b/templates/nav.html index c421c4d..8c91bdb 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -1,10 +1,12 @@