Skip to content

Commit

Permalink
Updated team page. Added more publication content incl fetching avata…
Browse files Browse the repository at this point in the history
…rs and project names.
  • Loading branch information
Sarah Allen committed Jun 18, 2015
1 parent 5a23bed commit 342ac3b
Show file tree
Hide file tree
Showing 10 changed files with 221 additions and 93 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@
/public/main.js
/public/main.js.map
/public/vendor.js

.DS_Store
258 changes: 174 additions & 84 deletions app/pages/publications-page.cjsx

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions app/pages/team-page.cjsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ counterpart.registerTranslations 'en',
interested in how galaxies change over time and how we can track this evolution.
Happy-go-lucky about outreach, the Zooniverse and everything.'''
rogerHutchings:
title: 'Title'
bio: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.'
title: 'Developer'
bio: '''Roger builds front end interfaces for the Zooniverse, and enjoys coding, music and rebuilding motorbikes in his spare time.'''
sandorKruk:
title: 'Researcher'
bio: '''Sandor is a graduate student working on his PhD in Astrophysics at Oxford.
Expand Down Expand Up @@ -200,7 +200,7 @@ teamMembers =
name: "Andrea Simenstad"
title: counterpart "team.content.andreaSimenstad.title"
bio: counterpart "team.content.andreaSimenstad.bio"
image: "http://placehold.it/80x80"
image: "./assets/team/andrea.jpg"
location: "minnesota"
brianCarstensen:
name: "Brian Carstensen"
Expand Down Expand Up @@ -240,7 +240,7 @@ teamMembers =
name: "Christopher Doogue"
title: counterpart "team.content.christopherDoogue.title"
bio: counterpart "team.content.christopherDoogue.bio"
image: "http://placehold.it/80x80"
image: "./assets/team/chris-d.jpg"
location: "oxford"
colemanKrawczyk:
name: "Coleman Krawczyk"
Expand Down Expand Up @@ -354,7 +354,7 @@ teamMembers =
name: "Roger Hutchings"
title: counterpart "team.content.rogerHutchings.title"
bio: counterpart "team.content.rogerHutchings.bio"
image: "http://placehold.it/80x80"
image: "./assets/team/roger.jpg"
location: "oxford"
sandorKruk:
name: "Sandor Kruk"
Expand All @@ -380,13 +380,13 @@ teamMembers =
name: "Simone Duca"
title: counterpart "team.content.simoneDuca.title"
bio: counterpart "team.content.simoneDuca.bio"
image: "http://placehold.it/80x80"
image: "./assets/team/simone.jpg"
location: "oxford"
veronicaMaidel:
name: "Veronica Maidel"
title: counterpart "team.content.veronicaMaidel.title"
bio: counterpart "team.content.veronicaMaidel.bio"
image: "http://placehold.it/80x80"
image: "./assets/team/veronica.jpg"
location: "chicago"
victoriaVanHyning:
name: "Victoria van Hyning"
Expand Down
37 changes: 36 additions & 1 deletion css/publications-page.styl
Original file line number Diff line number Diff line change
@@ -1,2 +1,37 @@
.publications-page
display: block
display: flex
flex-wrap: wrap

.publications-content
flex: 2 1 80%

h2
text-transform: capitalize

.publications-list
padding: 0

.project-name
display: inline-block

.publication-count
color: #5a5a5a
font-size: 1.4em
font-weight: 700

.publication-item
display: inline-flex
flex-wrap: wrap
list-style: none
margin: 1em 0
width: 100%

img
flex: 1 1 50px
margin-right: 1em
max-width: 50px
max-height: 50px

.citation
p
margin: 0
3 changes: 2 additions & 1 deletion css/team-page.styl
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
margin: 1.5em 0

img
width: 80px
border-radius: 4px
height: 80px
width: 80px

.team-member-details
flex-basis: 75%
Expand Down
Binary file added public/assets/team/andrea.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/team/chris-d.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/team/roger.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/team/simone.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/team/veronica.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 342ac3b

Please sign in to comment.