new files and template updates

diff --git a/content/log/2008-11-17_buttons b/content/log/2008-11-17_buttons
index 162ae2f336b22938cb91f8e90483c0972f515e5a..0901b737696d2ccc2e5344a83fbcca83996b5ed4 100644 (file)
--- a/content/log/2008-11-17_buttons
+++ b/content/log/2008-11-17_buttons
@@ -1,6 +1,6 @@
 title = button invasion
 date = 2009-11-17
-tags = monome, fabrication, electronics
+tags = monome fabrication electronics
 --
 
 ![monome, sparkfun](http://farm3.static.flickr.com/2649/4111923978_5746f85d8a.jpg)  

diff --git a/content/log/2009-12-13_mandala b/content/log/2009-12-13_mandala
index 93967b8e84f913dfb9faaf86eff315791647c68e..14255acb5d733093a5b7799eb732fd30d57c4339 100644 (file)
--- a/content/log/2009-12-13_mandala
+++ b/content/log/2009-12-13_mandala
@@ -1,11 +1,6 @@
 title = mandala
 date = 2009-12-13
-tags = art, graphic design
+tags = art graphic design
 --
 
-
-<img src="http://media.quilime.com/files/projects/mandala/mandala2.png" />
-
-<p>
-<a href="http://en.wikipedia.org/wiki/Endless_knot">endless knot</a>, <a href="http://en.wikipedia.org/wiki/Mandala">mandala</a>
-</p>
\ No newline at end of file
+![endless knot, mandala](http://media.quilime.com/files/projects/mandala/mandala2.png "endless knot, mandala" )
\ No newline at end of file

diff --git a/content/log/2010-07-01_icosi b/content/log/2010-07-01_icosi
new file mode 100644 (file)
index 0000000..ef966c3
--- /dev/null
+++ b/content/log/2010-07-01_icosi
@@ -0,0 +1,5 @@
+title = icosi fabrication progress
+date = 2010-07-07
+tags = icosi fabrication 
+--
+[![img](http://farm5.static.flickr.com/4140/4773799092_75e68e4e66.jpg)](http://www.flickr.com/photos/quilime/4773799092/)
\ No newline at end of file

diff --git a/pages/about b/pages/about
index 4d30f204c2e56c597b28fee31d216d7f6dd2175d..68ea0fd38149e36c0d994e2d5c9b9d90a8b3c710 100644 (file)
--- a/pages/about
+++ b/pages/about
@@ -1,8 +1,8 @@
 title = about
 --
-a codification of exploration, resources, and creativity.
+A codification of my explorations, process, and resources.
 
-**author**: gabriel dunne ([email](mailto:gdunne@quilime.com), [www](http://gabrieldunne.com))  
+**author**: Gabriel Dunne ([www](http://gabrieldunne.com), [email](mailto:gdunne@quilime.com))  
 **elsewhere**: 
 [flickr](http://flickr.com/photos/quilime/), 
 [delicious](http://delicious.com/quilime/), 

diff --git a/pages/agg b/pages/agg
index 8a2dcea069d0def061f07a6ad17997aca73d8bc5..c299cf685c1013d190fa4c01d7b445ace4bfa5a3 100644 (file)
--- a/pages/agg
+++ b/pages/agg
@@ -1,3 +1,3 @@
-title = agg
+title = aggregate
 template = agg
 --

diff --git a/pages/links b/pages/links
index 908153e08a5f95459d62e8dda2942f6910a88edc..4984cb23439e2cb352421f40489bc571e3eefa31 100644 (file)
--- a/pages/links
+++ b/pages/links
@@ -2,6 +2,7 @@ title = links
 type = page
 markdown = true
 --
+## friends and inspiration
 + [stephanie sherriff](http://ssherriff.com) →
 + [ryan alexander](http://onecm.com) →
 + [daniel massey](http://oddsympathy.com) →

diff --git a/public/css/style.css b/public/css/style.css
index 94881751d3afd599e66b40c3204cbb970cd5d4c3..f2017e73f441df11f19726cb6e47001f60641b1f 100644 (file)
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1,39 +1,46 @@
 body { margin:80px 100px 50px 40px; }
 html, body, table { font-family: sans-serif; font-size:12px; line-height:1.4em; color:#44d ; }
 
-.nav { position:absolute; z-index:1; top:20px; left:30px;  }
-.nav ul { margin-left:1em; }
-.nav h1 { margin-bottom:50px;}
 
-#head { position:absolute; top: 20px; left: 160px; }
-
-/*selection*/
 ::-moz-selection {background: #08f !important; color:#fff;} 
 ::selection {background: #08f !important; color:#fff;} 
 
-/*links*/
 a { color:#000; border:0; padding:0.2em 0.1em 0 0;  }
 a img { border:0; }
 a.mute { text-decoration:none !important; }
 a:hover, a.mute:hover { color:#d15; text-decoration:none; }
 
-/*headings*/
 h1, h2, h3, h4, h5, h6 {  font-size:1em; }
 h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { }
 h1 { margin:0 0 3em 0; }
 h2 { margin:0 0 0.5em 0;  }
 h3 { margin:0 0 0 0; }
 
+ul, li { margin:0; padding:0; list-style-type:none; }
 ol li { list-style-type:decimal; }
 
 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;}
 
-#content  p:first-child { margin-top:0; }
-
+#content { margin-left:120px; min-width:500px; position:absolute; top:20px; padding-bottom:200px; z-index:10;}
+#content p:first-child { margin-top:0; }
 p { max-width:720px; }
 
-ul, li { margin:0; padding:0; list-style-type:none; }
+
+.nav { position:absolute; z-index:1; top:20px; left:30px;  }
+.nav a { }
+.nav ul { margin-left:1em; }
+.nav h1 {  }
+    
+.entry { margin-bottom:100px; }
+.entry h2 { padding-bottom:4px; font-size:1.3em;}
+.entry .metadata { font-style:italic; color:#bbb; }
+.entry .metadata a { color:#999; }
+.entry .metadata a:hover { color: #000;}
+.entry .metadata .tags li { display:inline-block; margin-right:0.3em; }
+    
+.more, .home { text-decoration:none; color:#000; font-weight:bold; }
+
 table { margin:0; padding:0; border:0;  }
 table .column { padding-right:100px; min-width:120px; max-width:400px; }
 table .column h2 a { text-decoration:none; }
@@ -45,48 +52,13 @@ table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em;
 .bookmark_links li span { font-style: italic; color:#444; }
 .image li a { background:none;}
 
-table.archive td {padding-right:20px; }
+#footer {  margin-top:120px; }    
+#footer .copy a { text-decoration:none; }
+
+
 
-.c_pop { position:absolute; background:#fff; display:none; border:5px outset #000; padding:1em 2em; z-index:5; } 
 
-.func { font-weight:bold; color:#444; }
 
-#home_arrow { position: absolute; top:11px; left:23px; margin-left:250px; text-decoration:none; }
 
-#content { margin-left:120px; min-width:500px; position:absolute; top:20px; padding-bottom:200px; z-index:10;}
-    #content p {  }
-    ul.inline_content {}
-    ul.inline_content li .content { } 
-    ul.inline_content li { margin:0 0 150px 0; }
-    ul.inline_content li h3 { margin-bottom:1em; border-bottom:1px solid #ddd; padding-bottom:4px; }
-    ul.inline_content ol li { margin:0; padding:0; border:0;}
-    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; }
-    ul.thumbnails a:hover img { 
-        filter:alpha(opacity=75);
-        -moz-opacity:0.75;
-        -khtml-opacity: 0.75;
-        opacity: 0.75;
-    }     
-    ul.thumbnails a { text-decoration:none;  }   
-    ul.thumbnails .title {  }
-    
-    .date { color:#ccc;}    
-    .func { margin-bottom:2em; }
-    .func a { background:#daa;  padding:0.2em 1em 0.02em 1em; font-size:9px; text-transform:uppercase;}
 
-    .text { font-family:serif; font-size:15px; line-height:2.2em;  margin-top:80px;}
-    .indent { text-indent:3em; }
-    
-.entry { margin-bottom:100px; }
-.entry h2 { border-bottom:1px solid #ddd; padding-bottom:4px; }
-.entry h2 .title-date { font-weight:normal; color:#bbb; }
-.entry .metadata { margin-top:20px; font-style:italic; color:#aaa; }
-.entry .metadata .tags li { display:inline-block; margin-right:1em; }
-    
-.caption { font-style:italic; margin-top:5px; color:#444; }
-.more, .home { text-decoration:none; color:#000; font-weight:bold; }
 
-#footer {  margin-top:120px; }    
-#footer .copy a { text-decoration:none; }

diff --git a/templates/default.html.tpl b/templates/default.html.tpl
index d366eb78e45ef2945a49890aae8ff2e7d58c3835..8326d263089a8de83c2e9d53f7f91b3c5f0b903a 100644 (file)
--- a/templates/default.html.tpl
+++ b/templates/default.html.tpl
@@ -3,7 +3,7 @@
     
     <? $this->include_template('head-inc.html.tpl') ?>
     
-    <title><?=$this->page_title('; ');?></title>
+    <title><?=$this->page_title(': ');?></title>
     
 </head>
 <body>

diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl
index 699447468fe284cd702ce1b837c3d9c6ae2548d0..75726af0478a53a8b932262818876778b2bf7e55 100644 (file)
--- a/templates/entry.html.tpl
+++ b/templates/entry.html.tpl
@@ -2,23 +2,20 @@
 
        <h2>
                <a title="posted on <?=$data['date']?>" href="<?=$data['url']?>"><?=$data['title']?></a>
-               <span class="title-date" title="<?=date("F d, Y", $data['timestamp'])?>"><?=get_relative_time($data['timestamp']);?></span>             
        </h2>
 
        <div class="content">
                <?=$data['content']?>
        </div>
 
-       <? if ($single) :?>
        <div class="metadata">
-               posted <?=date("F d, Y", $data['timestamp'])?> in <a href="<?=get_base_dir();?>/<?=$data['cat'];?>"><?=$data['cat'];?></a><br/>
+               posted <abbr title="<?=get_relative_time($data['timestamp']);?>"><?=date("F d, Y", $data['timestamp'])?></abbr> in <a href="<?=get_base_dir();?>/<?=$data['cat'];?>"><?=$data['cat'];?></a><br/>
                <ul class="tags">
                <? if (sizeof($data['tags']) > 0) foreach($data['tags'] as $tag) : ?>
                <li>#<?=$tag?></li>
                <? endforeach; ?>
                </ul>
        </div>
-       <? endif; ?>
 
 </div>
 

diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 0c33098f7e365c51fd3968d632da912aa5fa1a9a..035739203383609dfeac4dac3b4f7f1015b0f010 100644 (file)
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -1,10 +1,8 @@
 <ul class="nav">          
 
-       <li><h2><a href="/"><?=SITE_TITLE;?></a></h2></li>
+       <li><h1><a href="/"><?=SITE_TITLE;?></a></h1></li>
        
-       <br />
        
-       <h2>content</h2>
        <? $dirs = get_dirs("/", array('recursive' => 0)); ?>
        <? foreach($dirs as $d) : ?>
        <li><a href="<?=get_base_dir();?>/<?=$d?>"><?=$d?></a></li>
@@ -12,7 +10,6 @@
        
        <br />
        
-       <h2>pages</h2>  
        
        <? $pages = get_pages(); ?>
        <? foreach($pages as $p) : ?>

diff --git a/templates/single.html.tpl b/templates/single.html.tpl
index e169285f49edcd4c73bb434c801687931adffdcc..65093519d4d6f7fe5627fc6ba1d275e1ef7087fc 100644 (file)
--- a/templates/single.html.tpl
+++ b/templates/single.html.tpl
@@ -3,7 +3,7 @@
     
     <? $this->include_template('head-inc.html.tpl') ?>
     
-    <title><?=SITE_TITLE?>, <?=$data['title'];?></title>
+    <title><?=SITE_TITLE?>: <?=$data['title'];?></title>
     
 </head>
 <body>