Permalink
Browse files

added image references, updated publications, footer activities

  • Loading branch information...
1 parent 7508f69 commit 6e3223c023238f8c61a83462eb2e89199fd64c54 @tom-de-smedt tom-de-smedt committed Mar 26, 2012
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Binary file not shown.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -57,16 +57,16 @@
<div class="four columns">
<h2><a href="/activities/">Activities</a></h2>
<ul>
- <li><a href="/activities/teaching.html">Teaching</a></li>
- <li><a href="/activities/workshops.html">Workshops</a></li>
- <li><a href="/activities/lectures.html">Lectures</a></li>
+ <li><a href="/teaching.html">Teaching</a></li>
+ <li><a href="/projects/conduit.html">Project: Conduit</a></li>
+ <li><a href="/projects/impact-of-generative-design-tools.html">Project: Generative Design Tools</a></li>
</ul>
</div>
<div class="four columns">
<h2><a href="/software/">Software</a></h2>
<ul>
<li><a href="/software/nodebox-1.html" title="The original, only for Mac OS X">NodeBox 1</a></li>
- <li><a href="/software/nodebox-2.html" title="The current generation with a node-based visual interface">NodeBox 2</a></li>
+ <li><a href="/software/nodebox-3.html" title="The current generation with a node-based visual interface">NodeBox 3</a></li>
<li><a href="/software/nodebox-opengl.html" title="The cross-platform, hardware-accelerated version">NodeBox for OpenGL</a></li>
</ul>
</div>
View
@@ -18,6 +18,7 @@ <h2 id="page-title">{{ page.title }}</h2>
{% for image in page.images %}
{% if image.size == 2 %}
<a class="thumb" rel="images" href="/media/{{ image[0] }}" title="{{ image[1] }}"><img src="/media/{{ image[0] }}" alt="{{ image[1] }}"></a>
+ <div class="caption">{{ image[1] }}</div>
{% else %}
<a class="thumb" rel="images" href="/media/{{ image }}"><img src="/media/{{ image }}" alt="{{ page.title }}"></a>
{% endif %}
View
@@ -1,22 +0,0 @@
----
-layout: base
----
- <!-- Page Title -->
- <div class="row">
- <div class="sixteen columns">
- <h2 id="page-title">{{ page.title }}</h2>
- </div>
- </div>
-
- <!-- Content -->
- <div class="twelve columns">
- {{ content }}
- </div>
-
- {% if page.images %}
- <aside class="four columns">
- {% for image in page.images %}
- <a class="thumb" rel="images" href="/media/{{ image }}"><img src="/media/{{ image }}" alt="{{ page.title }}"></a>
- {% endfor %}
- </aside>
- {% endif %}
View
Binary file not shown.
View
@@ -10,10 +10,10 @@ body {
-webkit-text-size-adjust: 100%;
}
-table { border-collapse: collapse; width: 100%; margin: 20px 0; }
-table th { font-weight: normal; text-transform: uppercase; }
-table th,
-table td {
+#content table { border-collapse: collapse; width: 100%; margin: 20px 0; }
+#content table th { font-weight: normal; text-transform: uppercase; }
+#content table th,
+#content table td {
border: 1px solid #ccc;
font-size: 85%;
text-align: left;
@@ -159,6 +159,8 @@ nav li a:hover {
#gallery .gallery,
#contact .contact {
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.3);
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.3);
+ -moz-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.3);
background: rgba(0,0,0, 0.3);
border-right: 0;
}
@@ -198,6 +200,10 @@ aside img {
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
}
+aside div.caption {
+ font-size: 80%;
+ margin: -8px 0 7px 0;
+}
/* Footer */
@@ -413,7 +419,6 @@ a.download {
/* People */
-#people #content img { padding: 0 8px 5px 0; clear: both; float: left; }
#people p { max-width: 550px; }
#people .box { max-width: 550px; }
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,11 +1,11 @@
---
-layout: software
+layout: default
section: software
title: Software
images:
- - software/nodebox3.jpg
- - software/nogl.jpg
- - software/nodebox1.jpg
+ - [software/nodebox3.jpg, NodeBox 3]
+ - [software/nogl.jpg, NodeBox for OpenGL]
+ - [software/nodebox1.jpg, NodeBox 1]
---
NodeBox 3
View
@@ -3,9 +3,9 @@ layout: default
section: teaching
title: Teaching
images:
- - teaching/ws2.jpg
- - teaching/ws1.jpg
- - teaching/vampyr.jpg
+ - [teaching/ws2.jpg, 2011 Vilnius workshop]
+ - [teaching/ws1.jpg, 2011 Helsinki workshop]
+ - [teaching/vampyr.jpg, 2011 master thesis Laura Broux]
---
**EMRG** hosts new media classes at the Sint Lucas School of Arts (Antwerpen, BE) in the 2nd and 3rd bachelor year. Classes usually span one semester and have a specific focus, for example generative art, data visualization or experimental typography. Students willing to dive in further are encouraged to adopt generative tools like [NodeBox](../software) within their master thesis. We have had students experimenting with real-time audio/video performance, visualization based on Twitter data, drawings based on text classification and sentiment analysis, for example.

0 comments on commit 6e3223c

Please sign in to comment.