Skip to content

Commit 938547a

Browse files
Added affiliate students
1 parent a20a71a commit 938547a

3 files changed

Lines changed: 14 additions & 13 deletions

File tree

_site/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Unitl recently, a cron job pulled updates from gihub to the live site (we should
4444
3. Run `ssh eis@eis.ucsc.edu` . You will need someone to share the password. Enter the password when prompted.
4545
4. Pull the changes from GitHub: `cd /www/eis.ucsc.edu` followed by `sh pull.sh`
4646

47-
## Some Interesting Filescl
47+
## Some Interesting Files
4848

4949
* `_config.yml`: The Jekyll configuration file. Ours is pretty straightforward at the moment, since we're not trying to do anything especially fancy, but you could modify this to do things like add new article types other than the default `page`.
5050
* `_data/publications.json`: An incomplete list of all our publications, stored as an array of JSON objects. This is used to build the table of publications on the site's `/publications` page, and could also be used as a data source for other pages. (For instance, we could pull out all the publications with a given tag and render them on the page for a particular project.)

_site/people/index.html

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@
103103
.content h3 {
104104
margin-bottom: 0.25em;
105105
}
106-
.content h3.middle {
107-
margin-top: 1em;
108-
}
109106
.content p {
110107
margin-bottom: 1rem;
111108
}
@@ -175,6 +172,9 @@ <h1><a href="/">Expressive Intelligence Studio</a></h1>
175172
margin-right: 2%;
176173
width: 32%;
177174
}
175+
.content h3.middle {
176+
margin-top: 1em;
177+
}
178178
.three > section:last-child {
179179
margin-right: 0;
180180
}
@@ -184,8 +184,7 @@ <h1><a href="/">Expressive Intelligence Studio</a></h1>
184184
width: 100%;
185185
}
186186
}
187-
</style>
188-
<section>
187+
</style><section>
189188
<h2>People</h2>
190189
<p>EIS members may be students (from the Computational Media, Digital Art and New Media, and Computer Science programs), post-docs, visiting scholars, or faculty.</p>
191190
<p>Former members of EIS are now in a wide range of roles. They are faculty at institutions such as American University, Cal Poly Pomona, Georgia Tech, Goldsmiths, Pomona College, Worcester Polytechnic Institute, UC Davis, UC Santa Cruz, University of Central Florida, Santa Clara University, and University of New Orleans. They are in industry at companies such as BBN, Caledonia, Electronic Arts, Funomena, Google, Kabam, Spirit AI, Trion Worlds, Y Combinator Research, and Zynga.</p>
@@ -218,11 +217,6 @@ <h3 class="middle">Affiliate Students</h3>
218217
<li><a href="https://allen-riley.com/">Allen Riley </a>&nbsp;(Ph.D.)</li>
219218
</ul>
220219
</section>
221-
<!-- <section>
222-
223-
<ul>
224-
</ul>
225-
</section> -->
226220
<section>
227221
<h3>Diaspora</h3>
228222
<ul>

people/index.html

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
margin-right: 2%;
1212
width: 32%;
1313
}
14+
.content h3.middle {
15+
margin-top: 1em;
16+
}
1417
.three > section:last-child {
1518
margin-right: 0;
1619
}
@@ -20,8 +23,7 @@
2023
width: 100%;
2124
}
2225
}
23-
</style>
24-
<section>
26+
</style><section>
2527
<h2>People</h2>
2628
<p>EIS members may be students (from the Computational Media, Digital Art and New Media, and Computer Science programs), post-docs, visiting scholars, or faculty.</p>
2729
<p>Former members of EIS are now in a wide range of roles. They are faculty at institutions such as American University, Cal Poly Pomona, Georgia Tech, Goldsmiths, Pomona College, Worcester Polytechnic Institute, UC Davis, UC Santa Cruz, University of Central Florida, Santa Clara University, and University of New Orleans. They are in industry at companies such as BBN, Caledonia, Electronic Arts, Funomena, Google, Kabam, Spirit AI, Trion Worlds, Y Combinator Research, and Zynga.</p>
@@ -48,6 +50,11 @@ <h3>Master's Students</h3>
4850
<ul>
4951
<li><a href="https://celinelafosse218.wixsite.com/portfolio/">Celine Lafosse</a></li>
5052
</ul>
53+
<h3 class="middle">Affiliate Students</h3>
54+
<ul>
55+
<li>Jack Kelly (Ph.D)</li>
56+
<li><a href="https://allen-riley.com/">Allen Riley </a>&nbsp;(Ph.D.)</li>
57+
</ul>
5158
</section>
5259
<section>
5360
<h3>Diaspora</h3>

0 commit comments

Comments
 (0)