Merge branch 'master' of https://github.com/codecombat/codecombat

app/styles/about.sass

@@ -11,11 +11,13 @@
 
       li
         list-style-type: none
-        padding-bottom: 20px
 
 
-    img
+    img.img-thumbnail
+      background-color: transparent
+      &:hover
+        background-color: rgba(200, 244, 255, 0.2)
       float: left
-      width: 150px
+      width: 100px
-      height: 150px
+      height: 100px
-
+      margin-top: 22px

app/styles/contribute_classes.sass

@@ -39,3 +39,16 @@
     .saved-notification
       display: none
       float: right
+
+  .thumbnail
+    background-color: transparent
+    height: 176px
+    &:hover
+      background-color: rgba(200, 244, 255, 0.2)
+
+    h4
+      text-align: center
+    img
+      max-width: 100px
+      max-height: 100px
+    

app/templates/about.jade

@@ -82,7 +82,8 @@ block content
     
         li.row
     
-          img(src="/images/pages/about/george.jpg").img-thumbnail
+          a(href="http://georgesaines.com")
+            img(src="/images/pages/about/george_small.png").img-thumbnail
   
           .col-sm-8
   
@@ -95,7 +96,8 @@ block content
     
         li.row
 
-          img(src="/images/pages/about/scott.jpg").img-thumbnail
+          a(href="http://scotterickson.info")
+            img(src="/images/pages/about/scott_small.png").img-thumbnail
   
           .col-sm-8
 
@@ -109,7 +111,8 @@ block content
     
         li.row
     
-          img(src="/images/pages/about/nick.jpg").img-thumbnail
+          a(href="http://www.nickwinter.net")
+            img(src="/images/pages/about/nick_small.png").img-thumbnail
   
           .col-sm-8
 
@@ -123,12 +126,11 @@ block content
 
         li.row
     
-          img(src="/images/pages/about/jeremy.jpg").img-thumbnail
+          img(src="/images/pages/about/jeremy_small.png").img-thumbnail
   
           .col-sm-8
 
-            h3
+            h3 Jeremy Arns
-              Jeremy Arns
     
             p(data-i18n="about.jeremy_description")
               | Customer support mage, usability tester, 
@@ -137,7 +139,8 @@ block content
 
         li.row
     
-          img(src="/images/pages/about/michael.jpg").img-thumbnail
+          a(href="http://michaelschmatz.com")
+            img(src="/images/pages/about/michael_small.png").img-thumbnail
   
           .col-sm-8
 

app/templates/contribute/archmage.jade

@@ -79,25 +79,15 @@ block content
       #Contributors
         h3(data-i18n="contribute.powerful_archmages")
           | Our Powerful Archmages:
-        ul.archmages
+        .row
-          li Tom Steinbrecher
+          for contributor in contributors
-          li Glen De Cauwsemaecker
+            .col-xs-6.col-md-3
-          li Sébastien Moratinos
+              .thumbnail
-          li Ronnie Cheng
+                if contributor.avatar
-          li phansch
+                  img.img-responsive(src="/images/pages/contribute/archmage/" + contributor.avatar + "_small.png", alt="")
-          li Zach Martin
+                else
-          li David Golds
+                  img.img-responsive(src="/images/pages/contribute/archmage.png", alt="")
-          li deepak1556
+                .caption
-          li Chloe Fan
+                  h4= contributor.name
-          li Rachel Xiang
-          li Dan Ristic
-          li gabceb
-          li Laura Watiker
-          li Shiying Zheng
-          li Mischa Lewis-Norelle
-          li Paul Buser
-          li Benjamin Stern
-          li Alex Cotsarelis
-          li MDP66
 
     div.clearfix

app/templates/contribute/artisan.jade

@@ -77,17 +77,17 @@ block content
       #Contributors
         h3(data-i18n="contribute.creative_artisans")
           | Our Creative Artisans:
-        ul.artisans
+        .row
-          li Sootn
+          for contributor in contributors
-          li Zach Martin
+            .col-xs-6.col-md-3
-          li Aftermath
+              .thumbnail
-          li mcdavid1991
+                if contributor.avatar
-          li dwhittaker
+                  img.img-responsive(src="/images/pages/contribute/artisan/" + contributor.avatar + "_small.png", alt="")
-          li Zacharias Fisches
+                else
-          li Tom Setliff
+                  img.img-responsive(src="/images/pages/contribute/artisan.png", alt="")
-          li Robert Moreton
+                .caption
-          li Andrew Witcher
+                  h4= contributor.name
-          li Axandre Oge
-          li Katharine Chan
 
     div.clearfix
+
+

app/views/contribute/archmage_view.coffee

@@ -4,3 +4,29 @@ template = require 'templates/contribute/archmage'
 module.exports = class ArchmageView extends ContributeClassView
   id: "archmage-view"
   template: template
+
+  contributors: [
+    {name: "Tom Steinbrecher", avatar: "tom"}
+    {name: "Glen De Cauwsemaecker", avatar: "glen"}
+    {name: "Sébastien Moratinos", avatar: "sebastien"}
+    {name: "deepak1556", avatar: "deepak"}
+    {name: "Ronnie Cheng", avatar: "ronald"}
+    {name: "Chloe Fan", avatar: "chloe"}
+    {name: "Rachel Xiang", avatar: "rachel"}
+    {name: "Dan Ristic", avatar: "dan"}
+    {name: "Brad Dickason", avatar: "brad"}
+    {name: "Rebecca Saines", avatar: "becca"}
+    {name: "Laura Watiker", avatar: "laura"}
+    {name: "Shiying Zheng", avatar: "shiying"}
+    {name: "Mischa Lewis-Norelle", avatar: "mischa"}
+    {name: "Paul Buser", avatar: "paul"}
+    {name: "Benjamin Stern", avatar: "ben"}
+    {name: "Alex Cotsarelis", avatar: "alex"}
+    {name: "Ken Stanley", avatar: "ken"}
+    {name: "devast8a", avatar: ""}
+    {name: "phansch", avatar: ""}
+    {name: "Zach Martin", avatar: ""}
+    {name: "David Golds", avatar: ""}
+    {name: "gabceb", avatar: ""}
+    {name: "MDP66", avatar: ""}
+  ]

app/views/contribute/artisan_view.coffee

@@ -5,3 +5,18 @@ template = require 'templates/contribute/artisan'
 module.exports = class ArtisanView extends ContributeClassView
   id: "artisan-view"
   template: template
+
+  contributors: [
+    {name: "Sootn", avatar: ""}
+    {name: "Zach Martin", avatar: ""}
+    {name: "Aftermath", avatar: ""}
+    {name: "mcdavid1991", avatar: ""}
+    {name: "dwhittaker", avatar: ""}
+    {name: "Zacharias Fisches", avatar: ""}
+    {name: "Tom Setliff", avatar: ""}
+    {name: "Robert Moreton", avatar: "rob"}
+    {name: "Andrew Witcher", avatar: "andrew"}
+    {name: "Axandre Oge", avatar: "axandre"}
+    {name: "Katharine Chan", avatar: "katharine"}
+    {name: "Derek Wong", avatar: "derek"}
+  ]

app/views/contribute/contribute_class_view.coffee

@@ -11,6 +11,7 @@ module.exports = class ContributeClassView extends View
   getRenderData: ->
     c = super()
     c.navPrefix = @navPrefix
+    c.contributors = @contributors
     c
 
   afterRender: ->
@@ -36,3 +37,5 @@ module.exports = class ContributeClassView extends View
 
     me.set('emailSubscriptions', subscriptions)
     me.save()
+
+  contributors: []