From 023e52b52d9d2b10f550646e41a34cc3ac2d3cb2 Mon Sep 17 00:00:00 2001
From: Gabriel Dunne <gdunne@quilime.com>
Date: Sun, 15 Sep 2013 12:43:59 -0700
Subject: [PATCH] Some minimalism

---
 css/style.css                  | 21 ++++++++++++++-------
 lib/config.ini                 |  2 +-
 templates/entry.html.tpl       |  6 +++++-
 templates/nav.html.tpl         |  9 ++++++++-
 templates/projectlist.html.tpl |  2 +-
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/css/style.css b/css/style.css
index 1f301bd..2292f8b 100644
--- a/css/style.css
+++ b/css/style.css
@@ -32,7 +32,7 @@ h1, h2, h3, h4, h5, h6 {
   /*font-family: helvetica, arial, verdana, sans-serif;*/
   font-weight: normal;
   color: #000;
-  font-size:1em; }
+  font-size:1em; line-height:1em; }
 h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
   color:#000;
   text-decoration: none;
@@ -47,7 +47,6 @@ h4 {
   }
 h6 {
   margin:2em 0 0 0 ;
-  line-height:0;
   padding:0;
 }
 
@@ -65,6 +64,8 @@ input[type="text"], textarea {
 }
 
 p {
+  margin-top:0;
+  padding-top:0;
   max-width:760px; 
   }
 
@@ -100,11 +101,13 @@ table, td, tr {
 
 #content {
   /*display:none;*/
+  margin-left:200px;  
+  position:absolute;
+  top:7em;
   padding-bottom: 20px;
   padding-top:0;
 }
 #content.single {
-  /*margin-left:200px;  */
   max-width:800px;
 }
 
@@ -151,10 +154,10 @@ table, td, tr {
 
 
 #nav {
-  margin-bottom:4em; 
+  /*margin-bottom:4em; */
 }
 #nav a {
-  font-weight:bold;
+  
 }
 #nav a.mute {  font-weight: normal }
 #nav li, ul.nav {
@@ -391,8 +394,6 @@ ul.entries li a:hover {
 }
 
 
-
-
 .archive li {
   padding-bottom:5px;
   margin-bottom:5px;
@@ -411,6 +412,12 @@ ul.entries li a:hover {
   position:absolute;
   left:2em;
 }
+.navprojectlist {
+  position:absolute;
+  top:7em;
+  width:200px;
+  left:0;
+}
 .projectlist li {
   text-transform: lowercase !important;
 }
diff --git a/lib/config.ini b/lib/config.ini
index 005e1bf..cd2b48d 100644
--- a/lib/config.ini
+++ b/lib/config.ini
@@ -1,5 +1,5 @@
 ; settings
-site_title  = GABRIEL DUNNE
+site_title  = Gabriel Dunne
 clean_urls  = 1
 limit       = 1000
 ; http://php.net/manual/en/function.date.php
diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl
index f2be0c9..1f98cf9 100644
--- a/templates/entry.html.tpl
+++ b/templates/entry.html.tpl
@@ -2,7 +2,7 @@
 
 <h2 class="title"><a href="<?=$entry->url?>"><?=$entry->title?></a></h2>
 
-<span class="date"><?=date('Y', $entry->timestamp)?></span>
+<!-- <span class="date"><?=date('Y', $entry->timestamp)?></span> -->
 
 <?
 	if (!isset($entry->inline_gallery) && isset($entry->media_gallery)) {
@@ -18,6 +18,8 @@
 
 	<div class="metadata">
 
+		<!--
+
  		<? if ($entry->tags): ?>
 			&mdash;<br />
 			<ul class="tags">
@@ -26,6 +28,7 @@
 			<? endfor; ?>
 			</ul>
 		<? endif; ?><br />
+		-->
 
 		<? if ($entry->related): ?>
 			&mdash;<br />		
@@ -41,6 +44,7 @@
 			</ul>
 		<? endif; ?>
 
+
 	</div>
 
 <? endif; ?>
diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 3a4b102..65c432d 100644
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -1,3 +1,7 @@
+<div class="navprojectlist">
+<? $this->include_template('projectlist.html.tpl') ?>
+</div>
+
 <div id="nav">
     <ul class="nav">
 
@@ -9,7 +13,10 @@
         'order' => SORT_ASC
         ) ); ?>
 <li><a href="/info">about</a></li>        
-<li><a href="/projects/">projects</a></li>
+
+<br />
+<!-- <li><a style="font-weight:normal" href="/projects/">projects</a></li> -->
+
 
 
 <!-- <li><a href="/tag">tag</a></li> -->
diff --git a/templates/projectlist.html.tpl b/templates/projectlist.html.tpl
index e3ef42c..85e6c48 100644
--- a/templates/projectlist.html.tpl
+++ b/templates/projectlist.html.tpl
@@ -1,5 +1,5 @@
 <?
-$r =  $this->_tpl_vars['request']['dirname'] ? $this->_tpl_vars['request']['dirname'] : $this->_tpl_vars['request']['basename'] . '/';
+$r =  isset($this->_tpl_vars['request']['dirname']) ? $this->_tpl_vars['request']['dirname'] : $this->_tpl_vars['request']['basename'] . '/';
 $m = new Model(get_request($r), 0);
 $projects = $m->entries;
 ?>
-- 
2.34.1