From 365d2587d21e3badac66082d6c71e3d04a494f76 Mon Sep 17 00:00:00 2001 From: Gabriel Dunne Date: Sat, 7 Dec 2013 00:35:41 -0800 Subject: [PATCH] Updates, back to black. --- css/style.css | 37 ++++++++++++++----------------------- lib/config.ini | 2 +- lib/data.php | 2 +- pages/{info => bio} | 25 ++++++++----------------- pages/cv | 1 + templates/footer.html.tpl | 9 +++++++++ templates/index.html.tpl | 6 +++--- templates/nav.html.tpl | 12 +++++++++--- 8 files changed, 46 insertions(+), 48 deletions(-) rename pages/{info => bio} (91%) diff --git a/css/style.css b/css/style.css index 59c75d3..cb5072c 100644 --- a/css/style.css +++ b/css/style.css @@ -1,7 +1,7 @@ html, body, table, textarea, input[type="text"] { - background:#eee; - color: #000; + background:#222; + color: #999; font-size: 12px; font-weight: normal; font-family: sans-serif; @@ -16,24 +16,24 @@ body { } a { border: 0pt none; - color:#111; - /*font-weight:bold;*/ } + color:#1EE4E4; + font-weight:bold; } a img { border: 0pt none; } a.mute { text-decoration: none ! important; } a:hover, a.mute:hover { - color:#d05; + color:#d26; text-decoration: none; } h1, h2, h3, h4, h5, h6 { /*font-family: helvetica, arial, verdana, sans-serif;*/ font-weight: normal; - color: #777; - font-size:1em; line-height: 1.5em; } + color: #555; +font-size:1em; +} h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { - color:#000; text-decoration: none; } h1 { @@ -100,9 +100,6 @@ table, td, tr { #content { /*display:none;*/ - margin-left:150px; - position:absolute; - top:2em; padding-bottom: 20px; padding-top:0; } @@ -153,7 +150,7 @@ table, td, tr { #nav { - /*margin-bottom:4em; */ + margin-bottom:4em; } #nav a { @@ -165,21 +162,23 @@ table, td, tr { margin:0; } #nav li { + display:inline-block; + margin-right:2em; margin-bottom:0.2em; } .nav a { - color:#444; text-decoration:none; } .nav a:hover { - color:#f00; } #nav .nav { - margin-bottom:2em; } #nav li.home { + } #nav li.home a { + font-size:1.2em; + color:#fff; } @@ -316,8 +315,6 @@ height:auto; } .entry .title a { margin-bottom:1em; - font-weight:normal; - color:#999; } .entry .metadata .date { @@ -387,12 +384,6 @@ ul.entries li a { font-weight:bold; text-decoration: none; } -a strong { - color:#000; -} -a:hover strong { - color:#f04; -} ul.entries li a:hover { /*text-decoration: underline;*/ } diff --git a/lib/config.ini b/lib/config.ini index cd2b48d..61015b7 100644 --- a/lib/config.ini +++ b/lib/config.ini @@ -1,5 +1,5 @@ ; settings -site_title = Gabriel Dunne +site_title = gabriel labov dunne clean_urls = 1 limit = 1000 ; http://php.net/manual/en/function.date.php diff --git a/lib/data.php b/lib/data.php index 55077f6..d6fdac8 100644 --- a/lib/data.php +++ b/lib/data.php @@ -304,7 +304,7 @@ function parse_entry($fileInfo, $page = false) $file['parentdir'] = basename($file['dirname']); //$file['dirname'] = dirname($fileInfo->getPath()); $file['filename'] = $fileInfo->getFilename(); - $file['title'] = isset($file['config']['title']) ? $file['config']['title'] : ($page ? $file['filename'] : $file['basename']); + $file['title'] = isset($file['config']['title']) ? htmlentities($file['config']['title']) : ($page ? $file['filename'] : $file['basename']); $file['fileInfo'] = $fileInfo; $file['config']['date'] = isset($file['config']['date']) ? $file['config']['date'] : null; $file['timestamp'] = $file['config']['date'] ? date('U', strtotime( $file['config']['date'])) : $fileInfo->getCTime(); diff --git a/pages/info b/pages/bio similarity index 91% rename from pages/info rename to pages/bio index 0e14595..56c949b 100755 --- a/pages/info +++ b/pages/bio @@ -1,13 +1,9 @@ template = page -- - + -1981 Born, Gabriel Labov Dunne, San Francisco, USA +b.1981 San Francisco, USA ###### contact @@ -16,14 +12,12 @@ studio at gabrieldunne dot com ###### network [blog](http://quilime.com) [twitter](http://twitter.com/quilime) -[github](http://github.com/quilime) -[flickr](http://flickr.com/photos/quilime)
- ###### exhibition -2013 Supernova 9-27, David Bower Center, Berkeley CA +2013 11 01 #SENSES, CODAME Arts + Tech Festival, San Francisco CA +2013 Supernova 9-27, David Bower Center, Berkeley CA 2013 SOMArts Night Light, San Francisco CA 2013 ArtHackDay "Lethal Software", San Francisco CA 2012 Audio ShaderToy, Creators Project, San Francisco, CA @@ -31,8 +25,8 @@ studio at gabrieldunne dot com 2010 PROTOTYPE, Gray Area, San Francisco CA 2010 Powers of 10, Gray Area, San Francisco, CA 2010 Seaquence, Gray Area, San Francisco CA -2008 Cabspotting, Stamen Design, Design and the Elastic Mind, NYC MoMA Permanent Collection. New York, NY -2006 SIGGRAPH, Boston +2008 Cabspotting, Stamen Design, Design and the Elastic Mind, NYC MoMA, NYC +2006 SIGGRAPH, Boston MA 2006 Interferenze: Naturalis Electronica, Valle Caudina, Italy 2006 Festival Sonar, Barcelona, Spain 2005 SIGGRAPH, Los Angeles @@ -116,7 +110,7 @@ But Does It Float Creativity Online -###### cv +###### cv Tessellated Group Obscura Digital BAVC @@ -127,9 +121,8 @@ Motion Theory
- + + diff --git a/templates/index.html.tpl b/templates/index.html.tpl index e59ada1..73178dd 100644 --- a/templates/index.html.tpl +++ b/templates/index.html.tpl @@ -9,9 +9,9 @@
- - - + + +
diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl index a92e9f1..49cdf1f 100644 --- a/templates/nav.html.tpl +++ b/templates/nav.html.tpl @@ -5,7 +5,12 @@