diff --git a/app/assets/images/pages/about/coco_comic.jpg b/app/assets/images/pages/about/coco_comic.jpg new file mode 100644 index 000000000..87ff27a54 Binary files /dev/null and b/app/assets/images/pages/about/coco_comic.jpg differ diff --git a/app/assets/images/pages/about/michael_small.png b/app/assets/images/pages/about/michael_small.png index e49de0534..84d56d4c3 100644 Binary files a/app/assets/images/pages/about/michael_small.png and b/app/assets/images/pages/about/michael_small.png differ diff --git a/app/assets/images/pages/about/placeholder.png b/app/assets/images/pages/about/placeholder.png new file mode 100644 index 000000000..997286b61 Binary files /dev/null and b/app/assets/images/pages/about/placeholder.png differ diff --git a/app/locale/en.coffee b/app/locale/en.coffee index a54115787..755ada82a 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -657,12 +657,16 @@ why_paragraph_4: "If you're going to get addicted to some game, get addicted to this one and become one of the wizards of the tech age." why_ending: "And hey, it's free. " why_ending_url: "Start wizarding now!" - george_description: "CEO, business guy, web designer, game designer, and champion of beginning programmers everywhere." - scott_description: "Programmer extraordinaire, software architect, kitchen wizard, and master of finances. Scott is the reasonable one." - nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." - jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." - michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." - matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." + george_title: "CEO" + george_description: "Businesser" + scott_title: "Programmer" + scott_description: "Reasonable One" + nick_title: "Programmer" + nick_description: "Motivation Guru" + michael_title: "Programmer" + michael_description: "Sys Admin" + matt_title: "Programmer" + matt_description: "Bicyclist" legal: page_title: "Legal" diff --git a/app/styles/about.sass b/app/styles/about.sass index 90cb3526c..ccb7787f7 100644 --- a/app/styles/about.sass +++ b/app/styles/about.sass @@ -18,6 +18,13 @@ &:hover background-color: rgba(200, 244, 255, 0.2) float: left - width: 100px - height: 100px - margin-top: 22px + width: 80px + height: 80px + margin: 0px 10px 22px 0px + + .team_name + margin-top: 0 + + .team_bio + width: 150px + float: left \ No newline at end of file diff --git a/app/templates/about.jade b/app/templates/about.jade index b9ffc3a57..fa31a820c 100644 --- a/app/templates/about.jade +++ b/app/templates/about.jade @@ -2,48 +2,17 @@ extends /templates/base block content + img(src="/images/pages/about/coco_comic.jpg") + .row .col-sm-6 - h2(data-i18n="about.who_is_codecombat") - | Who is CodeCombat? - - p - a(href="http://georgesaines.com/") George - span , - a(href="http://scotterickson.info/") Scott - span , - span(data-i18n="general.and") and - span - a(href="http://www.nickwinter.net") Nick - span - span(data-i18n="about.who_description_prefix") - | together started CodeCombat in 2013. We also created - a(href="http://www.skritter.com/") Skritter - span - span(data-i18n="about.who_description_suffix") - | in 2008, growing it to the #1 web and iOS application - | for learning to write Chinese and Japanese characters. - - p(data-i18n="about.who_description_ending") - | Now it's time to teach people to write code. - h2(data-i18n="about.why_codecombat") | Why CodeCombat? - - p(data-i18n="about.why_paragraph_1") - | When making Skritter, George didn't know how to program and was constantly - | frustrated by his inability to implement his ideas. Afterwards, - | he tried learning, but the lessons were too slow. His housemate, - | wanting to reskill and stop teaching, tried Codecademy, but "got bored." - | Each week another friend started Codecademy, then dropped off. - | We realized it was the same problem we'd solved with Skritter: - | people learning a skill via slow, intensive lessons when what they need is fast, - | extensive practice. We know how to fix that. p(data-i18n="about.why_paragraph_2") - | Need to learn to code? You don't need lessons. + | If you want to learn to program, you don't need lessons. | You need to write a lot of code and have a great time doing it. p @@ -69,11 +38,13 @@ block content | If you're going to get addicted to some game, | get addicted to this one and become one of the wizards of the tech age. - p.lead - span(data-i18n="about.why_ending") - | And hey, it's free. - a(href="/", data-i18n="about.why_ending_url") - | Start wizarding now! + h2 + | Bloggers/Press + + p + | Want to write about us? Feel free to download and use all of the resources included in our + a(href="https://s3.amazonaws.com/CodeCombatMisc/press_packet.zip") press packet. + | All logos and images may be used without contacting us directly. ul.col-sm-6.team-column @@ -81,87 +52,74 @@ block content ul.thumbnails li.row + + h2 Team - a(href="http://georgesaines.com") - img(src="/images/pages/about/george_small.png").img-thumbnail + img(src="/images/pages/about/george_small.png").img-thumbnail - .col-sm-8 + .team_bio - h3 + h4.team_name a(href="http://georgesaines.com") George Saines + p(data-i18n="about.george_title") + | CEO p(data-i18n="about.george_description") - | CEO, business guy, web designer, game designer, - | and champion of beginning programmers everywhere. + | Businesser - li.row - a(href="http://scotterickson.info") img(src="/images/pages/about/scott_small.png").img-thumbnail - .col-sm-8 + .team_bio - h3 + h4.team_name a(href="http://scotterickson.info") Scott Erickson + p(data-i18n="about.scott_title") + | Programmer p(data-i18n="about.scott_description") - | Programmer extraordinaire, software architect, - | kitchen wizard, and master of finances. - | Scott is the reasonable one. + | Reasonable one li.row a(href="http://www.nickwinter.net") img(src="/images/pages/about/nick_small.png").img-thumbnail - .col-sm-8 + .team_bio - h3 + h4.team_name a(href="http://www.nickwinter.net") Nick Winter + p(data-i18n="about.nick_title") + | Programmer p(data-i18n="about.nick_description") - | Programming wizard, eccentric motivation mage, - | and upside-down experimenter. - | Nick can do anything and chooses to build CodeCombat. - - li.row - + | Motivation Guru + a(href="http://michaelschmatz.com") img(src="/images/pages/about/michael_small.png").img-thumbnail - .col-sm-8 + .team_bio - h3 + h4.team_name a(href="http://michaelschmatz.com/") Michael Schmatz + p(data-i18n="about.michael_title") + | Programmer p(data-i18n="about.michael_description") - | Programmer, sys-admin, and undergrad technical wunderkind, - | Michael is the person keeping our servers online. + | Sys Admin li.row - img(src="/images/pages/about/jeremy_small.png").img-thumbnail + img(src="/images/pages/about/placeholder.png").img-thumbnail - .col-sm-8 + .team_bio - h3 Jeremy Arns - - p(data-i18n="about.jeremy_description") - | Customer support mage, usability tester, - | and community organizer; you've probably - | already spoken with Jeremy. - - li.row - - img(src="/images/pages/contribute/archmage.png").img-thumbnail - - .col-sm-8 - - h3 + h4.team_name a(href="http://www.mattlott.com/") Matt Lott + p(data-i18n="about.matt_title") + | Programmer p(data-i18n="about.matt_description") - | Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur - | of peanut butter, sipper of coffee. + | Bicyclist