From: Gabriel Dunne Date: Mon, 30 Sep 2013 06:55:10 +0000 (-0700) Subject: Updates to the design. X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=358cb5a0749b3dfce573a56a97b27936055172fe;p=plog.git Updates to the design. --- diff --git a/css/style.css b/css/style.css index e3e4173..c687be7 100644 --- a/css/style.css +++ b/css/style.css @@ -100,9 +100,9 @@ table, td, tr { #content { /*display:none;*/ - margin-left:200px; + margin-left:100px; position:absolute; - top:7em; + top:10em; padding-bottom: 20px; padding-top:0; } @@ -167,11 +167,11 @@ table, td, tr { #nav li { margin-bottom:0.2em; } - #nav .nav a { + .nav a { color:#444; text-decoration:none; } - #nav .nav a:hover { + .nav a:hover { color:#f00; } #nav .nav { @@ -234,7 +234,7 @@ margin-bottom:0.2em; .entries.projects li { /*display:inline-block;*/ float:left; - height:250px; + height:350px; width:200px; margin:0 2em 2em 0; } diff --git a/lib/config.ini b/lib/config.ini index 2e03ef8..cd2b48d 100644 --- a/lib/config.ini +++ b/lib/config.ini @@ -1,6 +1,5 @@ ; settings site_title = Gabriel Dunne ->>>>>>> 023e52b52d9d2b10f550646e41a34cc3ac2d3cb2 clean_urls = 1 limit = 1000 ; http://php.net/manual/en/function.date.php diff --git a/lib/data.php b/lib/data.php index 93bede0..55077f6 100644 --- a/lib/data.php +++ b/lib/data.php @@ -301,6 +301,7 @@ function parse_entry($fileInfo, $page = false) $pathparts = array_slice($get_pathparts, $content_key); $file['dirname'] = dirname(join($pathparts, DIRECTORY_SEPARATOR)); $file['basename'] = basename(join($pathparts, DIRECTORY_SEPARATOR)); + $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']); diff --git a/lib/model.php b/lib/model.php index 0306507..791066c 100644 --- a/lib/model.php +++ b/lib/model.php @@ -38,9 +38,9 @@ class Model # custom request for '/tag/*' if (isset($this->request['dirname']) && $this->request['dirname'] == 'tag') { $this->tag = $request['basename']; - $request['dirname'] = - $request['basename'] = - $request['filename'] = + $request['dirname'] = ""; + $request['basename'] = $this->request['basename']; + $request['filename'] = ""; $request['path'] = null; $request['extension'] = 'html'; $this->request = $request; @@ -48,7 +48,6 @@ class Model # if multiple (multiple files in CONTENT dir) if ($this->is_multiple()) { - if ($this->has_config() && !$_cfg) { $this->config = parse_config( $request['path'] ); if (isset($this->config->config->template)) { @@ -61,6 +60,7 @@ class Model $entries_args = array(); if ($this->tag) { + $this->template = 'projects.html.tpl'; $entries_args = array('tag' => $this->tag); } if (isset($this->config->config->show_featured) && !$this->tag) { diff --git a/pages/info b/pages/info index 9d68176..1f2730f 100755 --- a/pages/info +++ b/pages/info @@ -22,24 +22,6 @@ studio at gabrieldunne dot com - -###### edu -2003 B.A., Design | Media Art, UCLA -2001 Pont Aven School of Art (summer) -1999 College of Marin -
- -###### performance -2013 Vatica Dahlia "Rites", Brooklyn, NY -2013 ATOM TM, Live Visuals, San Francisco, CA -2012 UP Festival, Live Visuals, San Francisco, CA -2012 CCRMA Modulations, Live Visuals, San Francisco, CA -2011 Sepalcure, Shigeto, Simple & Santa. Live visuals. Gray Area, San Francisco, CA -2011 ICOSI, Milieux Sonores: Sound and Imaginary Space, GAFFTA, San Francisco, CA -2010 ICOSI, Biennial of the Americas. Denver, CO -
- - ###### exhibition 2013 Supernova 9-27, David Bower Center, Berkeley CA 2013 SOMArts Night Light, San Francisco CA @@ -56,6 +38,7 @@ studio at gabrieldunne dot com 2005 SIGGRAPH, Los Angeles 2005 :Output Festival, Amsterdam, Netherlands 2005 CiberArt: International Festival of New Technologies, Bilbao, Spain +2005 "Celestial Mechanics", M.F.A. Show, UCLA, Los Angles, CA 2003 Sur(Face), UCLA, Los Angeles, CA 2003 Eyberrations Digital Film Festival, Irvine, CA 2002 Melbourne International Film Festival, Melbourne, Australia @@ -66,8 +49,19 @@ studio at gabrieldunne dot com
-###### teaching / lectures -2013 Processing Workshop, Upload Festival, San Francisco, +###### performance +2013 Vatica Dahlia "Rites", Brooklyn, NY +2013 ATOM TM, Live Visuals, San Francisco, CA +2012 UP Festival, Live Visuals, San Francisco, CA +2012 CCRMA Modulations, Live Visuals, San Francisco, CA +2011 Sepalcure, Shigeto, Simple & Santa. Live visuals. Gray Area, San Francisco, CA +2011 ICOSI, Milieux Sonores: Sound and Imaginary Space, GAFFTA, San Francisco, CA +2010 ICOSI, Biennial of the Americas. Denver, CO +
+ + +###### teaching / talks +2013 Creating GIFs w/Processing, Upload Festival, San Francisco, 2012 Film/Code/Remix, BAVC, San Francisco, 2012 Processing, ACCU, Symantic, Palo Alto 2012 Processing, ACCU Davis Linux Users Group, Davis, CA @@ -87,6 +81,19 @@ studio at gabrieldunne dot com
+ + + + + + +###### edu +2003 B.A., Design | Media Art, UCLA +2001 Pont Aven School of Art (summer) +1999 College of Marin +
+ + ###### residencies / collaborations 2011—2012 Studio Collaboration w/ Vishal K. Dar, New Delhi, India. 2009—2010 Gray Area Foundation for the Arts, San Francisco diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl index 1f98cf9..1b2e4b5 100644 --- a/templates/entry.html.tpl +++ b/templates/entry.html.tpl @@ -18,8 +18,6 @@
- related): ?> —
diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl index 65c432d..3ddf1d6 100644 --- a/templates/nav.html.tpl +++ b/templates/nav.html.tpl @@ -1,7 +1,7 @@ -
+ --> diff --git a/templates/single.html.tpl b/templates/single.html.tpl index 398403d..2d48e5d 100644 --- a/templates/single.html.tpl +++ b/templates/single.html.tpl @@ -12,10 +12,6 @@ include_template('edit.html.tpl'); ?> - -