codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-23 23:58:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3252 from themaka/staff-update

Browse source 
Updating About page to include me
This commit is contained in:
Nick Winter 2015-12-09 08:45:21 -08:00
commit 7076a23fe2
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/pages/about/maka_small.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

2
app/locale/en.coffee
View file

@ -611,6 +611,8 @@
josh_c_blurb: "Designs games"
carlos_title: "Region Manager, Brazil"
carlos_blurb: "Celery Man"
maka_title: "Customer Advocate"
maka_blurb: "Storyteller"
teachers:
more_info: "More Info for Teachers"

9
app/templates/about.jade
View file

@ -210,3 +210,12 @@ block content
| Region Manager, Brazil
p(data-i18n="about.carlos_blurb")
| Celery Man
img(src="/images/pages/about/maka_small.png").img-thumbnail
.team_bio
h4.team_name
| Michael 'Maka' Gradin
p(data-i18n="about.maka_title")
| Customer Advocate
p(data-i18n="about.maka_blurb")
| Storyteller