From b901072e7f1b21fec748a9cd9bac6f649bf8f0cb Mon Sep 17 00:00:00 2001 From: Gabriel Dunne Date: Mon, 28 Dec 2009 16:55:19 -0800 Subject: [PATCH] updates --- content/content_folders_go_here | 0 content/projects/example/config | 2 -- content/projects/example/content.html | 1 - css/style.css | 27 +++++++++++++++------------ index.php | 7 ++++++- lib/config | 2 +- lib/scripts/2009-12-13 | 12 ------------ templates/about.html | 12 ++++++------ templates/agg.html | 4 +--- templates/code.html | 5 +++-- templates/contact.html | 25 ------------------------- templates/img.html | 6 ++---- templates/links.html | 13 +++++-------- templates/log.html | 27 ++++++++++++--------------- templates/nav.html | 8 ++------ templates/projects.html | 8 +------- 16 files changed, 54 insertions(+), 105 deletions(-) delete mode 100644 content/content_folders_go_here delete mode 100644 content/projects/example/config delete mode 100644 content/projects/example/content.html delete mode 100644 lib/scripts/2009-12-13 delete mode 100644 templates/contact.html diff --git a/content/content_folders_go_here b/content/content_folders_go_here deleted file mode 100644 index e69de29..0000000 diff --git a/content/projects/example/config b/content/projects/example/config deleted file mode 100644 index 038edfd..0000000 --- a/content/projects/example/config +++ /dev/null @@ -1,2 +0,0 @@ -title = Example -date = october 12 2009 diff --git a/content/projects/example/content.html b/content/projects/example/content.html deleted file mode 100644 index 4a89148..0000000 --- a/content/projects/example/content.html +++ /dev/null @@ -1 +0,0 @@ -This is an example project \ No newline at end of file diff --git a/css/style.css b/css/style.css index c0bc117..e77adc1 100644 --- a/css/style.css +++ b/css/style.css @@ -1,28 +1,29 @@ body { margin:10px 100px 50px 40px; } -html, body, table { font-family: helvetica; font-size:12px; line-height:1.5em; color:#222; } +html, body, table { font-family: helvetica; font-size:11px; line-height:1.5em; color:#222; } /*selection*/ ::-moz-selection {background: #08f !important; color:#fff;} ::selection {background: #08f !important; color:#fff;} /*links*/ -a { color:#07e; border:0; } +a { color:#07e; border:0; text-decoration:none; } a img { border:0; } -a.mute { color:#555; text-decoration:none; } +a.mute { color:#555; } a:hover, a.mute:hover { color:#fa4; background:#ffa; text-decoration:none; } .caption a { color:#888;} .caption a:hover { color:#905;} /*headings*/ 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; } /*code*/ -pre, .code { font-family: Monaco, monospace; font-size:11px; line-height:1.4em; background:#ddd; color:#50d; padding:1em 2em; } -span.code { padding:0.1em 0.5em; } +pre, .code { font-family: Monaco, monospace; font-size:11px; line-height:1.4em; background:#212121; color:#0f4; padding:1em 2em; } +span.code { padding:0.5em 1em; } blockquote { font-family:times; background:#000; color:#aaa; margin:0; font-size:15px; line-height:1.4em; padding:2em 4em; font-style:italic; line-height:1.45em; max-width:600px;} @@ -34,15 +35,15 @@ li { margin-bottom:1px; padding:1px; } table { margin:0; padding:0; border:0; } table .column { padding-right:100px; min-width:120px; max-width:275px; } table .column h2 a { text-decoration:none; } -table h2, table h3 { border-bottom:1px dotted #888; margin-bottom:1em;} +table h2, table h3 { margin-bottom:2em;} table .video li, table .image li { margin-bottom:2em; } -table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em; border-bottom:1px dotted #888; } +table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em; border-bottom:1px dotted #ddd; } .reader_links li, .bookmark_links li { padding-top:.75em; margin-bottom:.75em; } .bookmark_links li a { display:block; } .bookmark_links li span { font-style: italic; color:#444; } .image li a { background:none;} -.c_pop { position:absolute; background:#fff; display:none; border:5px outset #ad4; padding:1em 2em; left:260px; z-index:5; } +.c_pop { position:absolute; background:#fff; display:none; border:5px outset #000; padding:1em 2em; left:260px; z-index:5; } .func { font-weight:bold; color:#444; } @@ -51,9 +52,7 @@ table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em; #content { margin-left:120px; min-width:500px; } #content p { } ul.inline_content { } - ul.inline_content li { margin:0 0 50px 0; padding-bottom:50px; border-bottom:1px dotted #888; } - ul.inline_content li div.content li { padding:0; border:0; margin:0; } - ul.inline_content .date { color:#999; font-size:10px;} + ul.inline_content li { margin:0 0 50px 0; padding-bottom:75px; } ul.thumbnails { } ul.thumbnails li { display:inline-block; margin: 0px 60px 60px 0px; } ul.thumbnails .thumbnail { width:160px; height:120px; text-align:center; background:#888; } @@ -65,13 +64,17 @@ table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em; } ul.thumbnails a { text-decoration:none; } ul.thumbnails .title { } + + .date { font-weight:bold; } .text { font-family:serif; font-size:15px; line-height:2.2em; margin-top:80px;} .indent { text-indent:3em; } -.nav { position:absolute; top:1em; left:1em; line-height:1.1em;} +.nav { position:fixed; top:1em; left:1em; line-height:1.1em;} .nav ul { margin-left:1em; } +.nav li a { background:#ffe; font-weight:bold; } .nav h3 { margin-bottom:0.4em; } + .caption { font-style:italic; margin-top:5px; color:#444; } .more, .home { text-decoration:none; color:#999; } diff --git a/index.php b/index.php index 7d40586..98a47d7 100644 --- a/index.php +++ b/index.php @@ -5,7 +5,12 @@ $url_string = get_url_string(); if (is_string($url_string)) { - if (is_file ( TEMPLATE_DIR . basename($url_string) . '.html' )) { + + if ( basename($url_string) == "aggregate") { + header ("Location: http://quilime.com/aggregate/index.php"); + exit; + } + else if (is_file ( TEMPLATE_DIR . basename($url_string) . '.html' )) { include ( TEMPLATE_DIR . basename($url_string) . '.html' ); exit; } diff --git a/lib/config b/lib/config index 01cbcf4..ae63498 100644 --- a/lib/config +++ b/lib/config @@ -1,4 +1,4 @@ LOCAL_ROOT = /home/quilime/quilime.com/ -CONTENT_DIR = content/ +CONTENT_DIR = c/ TEMPLATE_DIR = templates/ SITE_TITLE = quilime diff --git a/lib/scripts/2009-12-13 b/lib/scripts/2009-12-13 deleted file mode 100644 index 7081025..0000000 --- a/lib/scripts/2009-12-13 +++ /dev/null @@ -1,12 +0,0 @@ -title = seanome -date = 2009-12-13 - --- - -
- - -

- - <?php echo SITE_TITLE ?> :about + <?php echo SITE_TITLE ?> - about @@ -14,11 +14,11 @@

-

about

- -

- built with project log by quilime -

+ © 1997— gabriel dunne. All rights reserved. +
+
+ email: gdunne@quilime.com +
diff --git a/templates/agg.html b/templates/agg.html index b02d1a4..25eec85 100644 --- a/templates/agg.html +++ b/templates/agg.html @@ -17,10 +17,8 @@
-

aggregate

-

- visual content and links + saved images, links for reference, inspiration

diff --git a/templates/code.html b/templates/code.html index a2b495a..9a16cbb 100644 --- a/templates/code.html +++ b/templates/code.html @@ -85,11 +85,12 @@ foreach($items_list as $items): ?>
- + + - +
- - - - - - <?php echo SITE_TITLE ?> :contact - - - - - - - -
- -

contact

- - email: gdunne@quilime.com - -
- - - - \ No newline at end of file diff --git a/templates/img.html b/templates/img.html index c068eb5..b467cfa 100644 --- a/templates/img.html +++ b/templates/img.html @@ -14,7 +14,7 @@ $img = get_rss_feed('http://api.flickr.com/services/feeds/photos_public.gne?id=2 @@ -25,8 +25,6 @@ $img = get_rss_feed('http://api.flickr.com/services/feeds/photos_public.gne?id=2
- -

img

    channel->item as $item) : ?> @@ -42,7 +40,7 @@ $img = get_rss_feed('http://api.flickr.com/services/feeds/photos_public.gne?id=2
    - via flickr → + more →
diff --git a/templates/links.html b/templates/links.html index 63235ad..d1a8d1c 100644 --- a/templates/links.html +++ b/templates/links.html @@ -14,8 +14,6 @@
-

links

- -

me

+ -

people

+

links

diff --git a/templates/log.html b/templates/log.html index c9e3492..6a61f25 100644 --- a/templates/log.html +++ b/templates/log.html @@ -36,7 +36,7 @@ -

log /

+

log /

@@ -58,10 +58,12 @@ ?>
- + + +

-

- view inline -

+ + view inline + @@ -87,23 +89,18 @@

  • + - -

    - - - -
    - + +

    • -

    - archive -

    + vew archive + diff --git a/templates/nav.html b/templates/nav.html index b578819..5416a8d 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -5,11 +5,7 @@

    - -
  • - (process
    and
    projects) -
    • - +
    @@ -22,7 +18,7 @@
  • aggregate
  • links
    • -
  • contact
    • +
  • about

    • diff --git a/templates/projects.html b/templates/projects.html index a70ed43..6e80fd0 100644 --- a/templates/projects.html +++ b/templates/projects.html @@ -41,14 +41,8 @@ - -

    projects

    - -

    slightly borked. bbl.

    -

    - in the meantime, go here:
    - gabrieldunne.com/projects/
    + current
    2008
    2007
    2004 - 2006 -- 2.34.1