diff --git a/.travis.yml b/.travis.yml index 96fe9c311..26f9adf3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ notifications: secure: ezESiG7JnuSLZc2/PPhOvWUv5BHBCr+g86MsuLLw+S+zz3DUfzWHMQ1g5tUvkeSDTPmfEIX41EnPkaoWtsD3OGO0PGXgseAfA8+6Z4N1rICNZZrhXZB2s6UdwRK1e+0Jol4W3kHmt96BHyN2scLNgJYeWMgSJllVsuPhMTlKBZIXI9u540NH8Nxjl3f2WvoIg64Q1mZvMxkpPbw4xssx6U4HSFE8kTTE6+EFsSxzombFX0cLGjPiJ9QZgGVUk4UkIjyiFLQQDfQlLllCaUpqJ9+qbuCNoMSKA2yty/qyZ8Y+r4OlMberjmBzR9GRLLyXWWcaAfMIgwlRhjtLYIDAUSsGM1iwUWCgyB9maG2IiXuYLSueuMx8DcDwbpUepoDgnqBYnM2AJmT8gcsxqlKYzJpYpHDgZgBlLZQgMXqjrVJHs/Tf9XVcLS6HAn1Ww0OOT01jThfy4gClpAuqLayYexsXOoL+RaFg25E2NzuTtaFWgRfWZgcAeqYNDiUzwun2D4vZ5I+NtdRP0gzpbG2fxhFz05vAqyf1Kp6ZYb17Li3A38dIm6Lsvv3qawAIAgNaZpIZX3f89+uq6jHU8kJy1Iv823JK2Xac3vEz3SHUKJnuXFF0LO07om9AcNEXhP/JrJ617S8nfvDtZRJODMFhz8qQwie+65Ql1I871goBpVs= env: global: - - secure: kXRyOECCfmTmIyibSKyHFz9cC5YGDsLIZJyiSpepvjRvuuJErxpD3yokp++JCJXdj/CRfJKazeMPkgek78zGiI/xnHR2aVxuQraU5ELIVNBCaFDtM4lKxtTVvEAtErwhWrH9zMiJkgXGF/MwID0QgZVlD/hpKI3MoS8sS1dmvDlqlregTvUZWBnlqMnrQuOXFNLPT+/QPgO6myd+nJn+XogSw8HceUo76cOADBphLtxFvE+R3FEbkHOwgJzUR3p8FstNXjmXZocSAYlGEgf1QIAN7M+3fH3wBHUBL2XELlr3w6eFr0qPCT5GCIxc4DNYsNt1360nmhSUqcm+k30HcbGmM5oWiRTmo2NrNpKhCUyF9wKHKmS4JYqGBEBjLxkTZe/zCv18gNVy0s9x/IXP3qP9SoRnlNEt9H6MjaxBc3lWD47UmcDJoLrs7OUdM4HDxgmPJyTzJsg059GEWgHuEMGIGGCYBGdpNlu4ZH6yEgsji73+kAkYbnVzhz4QtfhGNgQv3kEhTmDHW5muca5EMuSyOLW5v4ffpLJgirJQi9lvjZ/pZ+XJU0DSfIHdViqop6hRrsPxo2ewle3RcZrlQuw7lJJp9IoDT5Ku2PU1m8+705CR8S96DrMP8UtbC1Plcv91MMGmwgPwYAQwEcTnj7Fsq9QKReus+CTUXYqaMQM= - - secure: D7TVtzhDPvSsipXB9jiokA00rUAENWjK5Lrv+JOgdNe35D9j3tSSgT+iKj2Et5LcSeKXpvC2gMDXakHMflo2tT8uYPx7NI6J9XZMro2VP+ebTHlG57Fuoves9XxwCvHDFk2yW/K7uma8a92rs4PNydJRB6SPm3pWjL29Ih2n9ZFy37ZHCdL26R61EJ9SZh5siOVuXhqB36mu0Z9ANjXeXcLrKzpRf8mmORsK9NT/0A9kg4a0Q9ZKiHhUp3Wh3VKfDlDvqYszdofBNSpUGSyj/J4IlpYld8q+o+husxr3yLbV+FR1xdJ8NS04iXEmd1yOhJKy7ienpNQJ7NLwSOgDQ+Y8VZJUf0ZvSX/acHqNFQC86tW15KTAEVfnY8Js7mqmZrsWoY6+jzC8RyaQoZiD1HQfJLHkG+uqrfPYhWy1BNz+4QtBwnnQO+E/B2CM+fGAmjoJ+UjquWQo+sHWwoatNrG85JumA3GsA1FSlkzEVy3AAcST/CFZ1IyGCDVTar++2VwYCH691DuJy1gyeqSukSbRQIhGTSktArv0FjIiVsoMTCB/Ntg8HcfL6ADTfsijZVL9v5hN2VUXg3BjuF4TEBsrN78WMNI+U3g1+W1UW+036eP09Z7QDxIvLoQdIaQncGBny2KnR2j/Gmgz9eG0eg4dlV+2W+9DqE4y+tmU4Jw= + - secure: A138rYuXDsOmpEwYxZ31WyXEeq5fgr9qyqsQh1nTFsjBKpFtNM+CN9e0QJQFT3PLs4wH/lWTRSyHxakxKQS1sxq828f9gHed+f15REKk/fRUplcCYIexT9xKVtU3D8CRNn/KBFWk75fZyZt20eyOVIv4h3pInKQz7y84J6PWzB1BCrAFvADrzS1X68Z3NJJLyxnz0YEurzz8mC2v4D0s/XifKTWvRtefD4QM6pE0C2iYyk+ThrLwg7i9FDHVfo0MrkgcdX7mz37SnTr7p7mHWnGXrGngi/NiDRQ+Uwwq/sr2UIww0rCwS1xsOcS//dC4NNqrrt1kUTsoC1Yt87Ny+gI0nUplsfEpdKajAkOYdANC5bJUGqPdSlOds1v9aJs9Hx48uGamWkm/3cFmoJ5uA2ZzUwbSGjTkWbnhwzT0YRvcLGhP1WE/EswaIyK5qMp522E79mP1yH6M750iUvi4N39+QW1BNX3ADkOwyAI67ArX5on5gWP83RXcJ15im7XsBpsmVn/KXi6AouWPb8jmSmKCj0QZCzfLY7ivM42IugYpK2NV7kFB38DpXQamJ5eskgwYa3elRmednIFUuwb1QDnONvJogVjk4CLmoSxssC2mJnnrUItM7l8G6As81GMI+6lTtl86hAuXBjUk60FMbgTAQDX9ll26LgpBy8jHSx8= + - secure: EX1fyov+f6ytWN2ZSL4dLslwrVkp6Ho/uoSLO38/qNG3XdGmBN4VprxddcQiWfo+Mrg3GdWcfcM/VazhhStBi1uLfZiw3RHZaSGuWbiuD2EtzqtlC+OVvoajgy91QFajh9Zzuwa0rYbEPd/sw01R53NoWJYl0GSteWk7C8Wv6anl4FUJCqgvvTV2ZEcyTtGcVJgUhKi1MfNpTSM6JWBy0DWszcyxj7C8LSs1+l9ZjAtnlUBWY13HsrNu8G5d+FwqGHZLUAjdu2O602wxV897/xLARLduZ+01ALpVefNEEGMB1Wd+xMw4dm2B0Uk86a4TBRCeOgJZ1yoJoPpGPOHTo+dgNXcU8ReszGVoy7uOjFWwu82FQq8gzfcf75yzaRJgG8/BJ6BkJfa0EmFg3iO5CwixQyHR5+CqsedtoLAWVT8zlOfQ/Z6yx4Pm7jXQSOkyvo09YJ2QIn4IFGPvwOVS7Firzi+fLl8GYApeSV9G10e1IzA4pPrKdJMRA4qRMPt9zJGq7ZO1J/d9aW/5KIsJUDnodnl7yXJyDMOyNeljT9I82ciHZcURxRRY080vrW6dgNJE1V9jxBhWEvr2iCeWMMedWaGuC41I7K9L79eW8lmaE+cQ+OZrzpOJP4GbfmIiXrh+0M4ChL/xBpjtiFwpNdkCXXhzWMnjJ4wCrii4yuc= - EB_REGION=us-east-1 - EB_APP=scratch-www - EB_AWS_BUCKET_NAME=elasticbeanstalk-us-east-1-307680192167 @@ -32,7 +32,10 @@ deploy: env: scratch-www-staging on: repo: LLK/scratch-www - branch: develop + branch: + - develop + - hotfix/* + - release/* - provider: elasticbeanstalk access_key_id: $EB_AWS_ACCESS_KEY_ID secret_access_key: $EB_AWS_SECRET_ACCESS_KEY diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cee92531a..9979a70e2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,13 +1,12 @@ -### Where am I? ### -Physically? No idea. +## I wanna contribute! +Sweet! The transition from existing to new codebase is an ongoing process, and we love to have people in the Scratch and Open Source communities help us along the way, and even afterwards as we develop new features for Scratch here. -Digitally? You’re at Scratch’s open source Web Client! +Here are some ways you can contribute: +* [Report bugs](https://github.com/LLK/scratch-www/wiki/Reporting-Bugs) +* [Work on bugs and make pull requests](https://github.com/LLK/scratch-www/wiki/Workflow-for-Repo-Contributions) + * Make sure to check out how to [assign yourself bugs](https://github.com/LLK/scratch-www/wiki/Assigning-Yourself-Bugs) too. -At Scratch, we’re working to update our UI to use a new codebase, which will be contained in this repository. The transition from existing to new codebase is an ongoing process, and we love to have people in the Scratch and Open Source communities help us along the way, and even afterwards as we develop new features for Scratch here. - - -### Who and what will I find here? ### -We are always excited to have people join us in working to make Scratch a wonderful place for people of all ages to make projects together. If you’re new here, and looking to jump into our wonderful community, we have some wonderful resources for you to take a look at: +We are always excited to have people join us in working to make Scratch a wonderful place for people of all ages to make projects together. If you’re new here, and looking to jump into our wonderful community, we have some resources for you to take a look at: * [README](https://github.com/LLK/scratch-www/blob/develop/README.md) (if you’re to read only one me in this repo, make it this one – it has all of the necessary information for getting a local Scratch UI running on your machine!) * [Community Guidelines](https://github.com/LLK/scratch-www/wiki/Community-Guidelines) (we find it important to maintain a constructive and welcoming community, just like on Scratch) @@ -21,15 +20,3 @@ Beyond this repo, there are also some other resources that you might want to tak [Advanced Topics forum](https://scratch.mit.edu/discuss/31/) on Scratch (like Topics, but more complex-y) -### I wanna contribute! ### -Sweet! Here are some ways you can contribute: -* [Report bugs](https://github.com/LLK/scratch-www/wiki/Reporting-Bugs) -* [Work on bugs](https://github.com/LLK/scratch-www/wiki/Workflow-for-Repo-Contributions) - * Make sure to check out how to [assign yourself bugs](https://github.com/LLK/scratch-www/wiki/Assigning-Yourself-Bugs) too. - - -We’re currently building Scratch using [React](https://facebook.github.io/react/) and [SCSS](http://sass-lang.com/documentation/file.SASS_REFERENCE.html). Here are some resources to help you get acquainted with how we’re working on the Scratch codebase: -* [Style Guide](https://github.com/LLK/scratch-www/wiki/Style-Guide) -* [Testing Guide](https://github.com/LLK/scratch-www/wiki/Testing-Guide) -* [Localization Guide](https://github.com/LLK/scratch-www/wiki/Localization-Guide) -* [Map of the repository](https://github.com/LLK/scratch-www/wiki/Repo-Map) diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..c9e7aa927 --- /dev/null +++ b/LICENSE @@ -0,0 +1,12 @@ +Copyright (c) 2015, Massachusetts Institute of Technology +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 8578cae57..000000000 --- a/LICENSE.md +++ /dev/null @@ -1,13 +0,0 @@ -Copyright 2015 Massachusetts Institute of Technology - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file diff --git a/README.md b/README.md index 8f5d1e750..8b6f28dfd 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,22 @@ ## scratch-www #### Standalone web client for Scratch -[![Build Status](https://magnum.travis-ci.com/LLK/scratch-www.svg?token=xzzHj4ct3SyBTpeqxnx1)](https://magnum.travis-ci.com/LLK/scratch-www) +[![Build Status](https://travis-ci.org/LLK/scratch-www.svg)](https://travis-ci.org/LLK/scratch-www) + +### Where am I? +Physically? No idea. + +Digitally? You’re at Scratch’s open source web client! + +We’re working to update the [Scratch website](https://scratch.mit.edu) to use a new codebase, contained in this repository. + +We’re currently building Scratch using [React](https://facebook.github.io/react/) and [SCSS](http://sass-lang.com/documentation/file.SASS_REFERENCE.html). Here are some resources to help you get acquainted with how we’re working on the Scratch codebase: + +* [Style Guide](https://github.com/LLK/scratch-www/wiki/Style-Guide) +* [Testing Guide](https://github.com/LLK/scratch-www/wiki/Testing-Guide) +* [Localization Guide](https://github.com/LLK/scratch-www/wiki/Localization-Guide) +* [Map of the repository](https://github.com/LLK/scratch-www/wiki/Repo-Map) + ### Before Getting Started * make sure you have node and npm [installed](https://docs.npmjs.com/getting-started/installing-node) @@ -39,7 +54,7 @@ Use `^C` to stop the node process `npm start` starts. | `PORT` | `8333` | Port for devserver (http://localhost:XXXX) | | `FALLBACK` | `''` | Pass-through location for old site | -**NOTE:** Because by default both `API_HOST=https://api.scratch.mit.edu` and `FALLBACK=https://scratch.mit.edu`, please be aware that, by default, you will be seeing and interacting with real data on the Scratch website. +**NOTE:** Because by default `API_HOST=https://api.scratch.mit.edu`, please be aware that, by default, you will be seeing and interacting with real data on the Scratch website. ### To Test ```bash @@ -56,3 +71,5 @@ Most of the issues we have currently revolve around the use of `FALLBACK`. This Setting `FALLBACK=https://scratch.mit.edu` allows the web client to retrieve data from the Scratch website in your development environment. However, because of security concerns, trying to send data to Scratch through your development environment won't work. This means the following things will be broken for the time being: * Login on the splash page (*In the process of being fixed*) * Some update attempts to production data made through a development version of the web client + +Additionally, if you set `FALLBACK=https://scratch.mit.edu`, be aware that clicking on links to parts of the website not yet migrated over (currently such as `Explore`, `Discuss`, `Profile`, etc.) will take you to the Scratch website itself. diff --git a/TRADEMARK b/TRADEMARK new file mode 100644 index 000000000..3e1ec5bf4 --- /dev/null +++ b/TRADEMARK @@ -0,0 +1,7 @@ +The Scratch trademarks, including the Scratch name, logo, the Scratch Cat, Gobo, Pico, Nano, Tera and Giga graphics (the "Marks"), are property of the Massachusetts Institute of Technology (MIT), and the use of the Marks is governed by this policy. + +You may use the Marks to refer to Scratch in Substantially Unmodified form. + +"Substantially Unmodified" means the source code provided by MIT, possibly with minor modifications including but not limited to: bug fixes (including security), changing the locations of files for better integration with the host operating system, adding documentation, and changes to the dynamic linking of libraries. + +A version is not "Substantially Unmodified" if it incorporates features not present in a release of Scratch by MIT. If you do make a substantial modification, to avoid confusion with versions of Scratch produced by MIT you must remove all Marks from your version of the software and refrain from using any of the Marks to refer to your version. diff --git a/bin/build-locales b/bin/build-locales index 878fb0e81..136ea385b 100755 --- a/bin/build-locales +++ b/bin/build-locales @@ -90,6 +90,12 @@ for (var id in generalIds) { icuWithIds[generalIds[id]] = 'general-' + id; } +// start with all views, and remove localized ones as they are iterated over +var views = glob.sync(path.resolve(__dirname, '../src/views/*')); +for (var i = 0; i < views.length; i++) { + views[i] = views[i].split('/').pop(); +} + // get view-specific locale strings. var files = glob.sync(path.resolve(__dirname, '../src/views/**/l10n.json')); files.forEach(function (file) { @@ -152,10 +158,13 @@ glob(poUiDir + '/*', function (err, files) { } }); - for (var view in viewLocales) { - var viewTranslations = merge(viewLocales[view], generalLocales); + for (var i in views) { + var viewTranslations = generalLocales; + if (views[i] in viewLocales) { + viewTranslations = merge(viewLocales[views[i]], viewTranslations); + } var objectString = JSON.stringify(viewTranslations); var fileString = 'window._messages = ' + objectString + ';'; - fs.writeFileSync(outputDir + '/' + view + '.intl.js', fileString); + fs.writeFileSync(outputDir + '/' + views[i] + '.intl.js', fileString); } }); diff --git a/package.json b/package.json index 5ca221023..d6b832f86 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "type": "git", "url": "git+ssh://git@github.com/llk/scratch-www.git" }, - "author": "MIT", - "license": "MIT", + "author": "Massachusetts Institute of Technology", + "license": "BSD-3-Clause", "bugs": { "url": "https://github.com/llk/scratch-www/issues" }, diff --git a/src/components/banner/banner.jsx b/src/components/banner/banner.jsx index adc45654b..e9808228e 100644 --- a/src/components/banner/banner.jsx +++ b/src/components/banner/banner.jsx @@ -3,6 +3,10 @@ var React = require('react'); require('./banner.scss'); +/** + * Container for messages displayed below the nav bar that can be dismissed + * (See: email not confirmed banner) + */ var Banner = React.createClass({ type: 'Banner', propTypes: { diff --git a/src/components/carousel/carousel.jsx b/src/components/carousel/carousel.jsx index 6df20b26b..4120b835d 100644 --- a/src/components/carousel/carousel.jsx +++ b/src/components/carousel/carousel.jsx @@ -9,6 +9,9 @@ require('slick-carousel/slick/slick.scss'); require('slick-carousel/slick/slick-theme.scss'); require('./carousel.scss'); +/** + * Displays content in horizontal scrolling box. Example usage: splash page rows. + */ var Carousel = React.createClass({ type: 'Carousel', propTypes: { diff --git a/src/components/carousel/carousel.scss b/src/components/carousel/carousel.scss index 2ab231916..dd2bac747 100644 --- a/src/components/carousel/carousel.scss +++ b/src/components/carousel/carousel.scss @@ -5,6 +5,7 @@ $button-offset: $icon-size + 5px; $box-content-offset: 20px; + margin-bottom: 0; padding: 12px $button-offset; .box-content & { @@ -28,8 +29,10 @@ content: ""; } - &.slick-disabled:before { - opacity: 1; + &.slick-disabled { + &:before { + opacity: 1; + } } } @@ -38,11 +41,11 @@ &:before { background-image: url("/svgs/carousel/prev_ui-dark-gray.svg"); - } - &:hover:before { - background-image: url("/svgs/carousel/prev_ui-blue.svg"); - background-size: 90%; + &:hover { + background-image: url("/svgs/carousel/prev_ui-blue.svg"); + background-size: 90%; + } } @@ -56,11 +59,11 @@ &:before { background-image: url("/svgs/carousel/next_ui-dark-gray.svg"); - } - &:hover:before { - background-image: url("/svgs/carousel/next_ui-blue.svg"); - background-size: 90%; + &:hover { + background-image: url("/svgs/carousel/next_ui-blue.svg"); + background-size: 90%; + } } .box-content & { diff --git a/src/components/intro/intro.jsx b/src/components/intro/intro.jsx index 101501627..c7434278c 100644 --- a/src/components/intro/intro.jsx +++ b/src/components/intro/intro.jsx @@ -64,10 +64,12 @@ var Intro = React.createClass({ + src="//cdn.scratch.mit.edu/scratchr2/static/images/cat-a.png" + alt="Scratch Cat" /> + src="//cdn.scratch.mit.edu/scratchr2/static/images/cat-b.png" + alt="Scratch Cat" />
{this.props.messages['intro.tryItOut']} @@ -76,10 +78,12 @@ var Intro = React.createClass({ + src="//cdn.scratch.mit.edu/scratchr2/static/images/tera-a.png" + alt="Tera" /> + src="//cdn.scratch.mit.edu/scratchr2/static/images/tera-b.png" + alt="Tera" />
{this.props.messages['intro.seeExamples']} @@ -88,10 +92,12 @@ var Intro = React.createClass({ + src="//cdn.scratch.mit.edu/scratchr2/static/images/gobo-a.png" + alt="Gobo" /> + src="//cdn.scratch.mit.edu/scratchr2/static/images/gobo-b.png" + alt="Gobo" />
{this.props.messages['intro.joinScratch']} @@ -122,7 +128,8 @@ var Intro = React.createClass({
- + Intro Video

  • - +

    • @@ -56,25 +56,25 @@ var About = React.createClass({

  • - +

  • - +

  • - + Quotes about Scratch

  • - +

    • diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index 88fe2fb4f..bded78d60 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -14,112 +14,112 @@ var Credits = React.createClass({
    • - + Mitchel Avatar Mitchel Resnick
    • - + Natalie Avatar Natalie Rusk
    • - + Sayamindu Avatar Sayamindu Dasgupta
    • - + Ricarose Avatar Ricarose Roque
    • - + Ray Avatar Ray Schamp
    • - + Eric Avatar Eric Schilling
    • - + Chris Avatar Chris Willis-Ford
    • - + Carl Avatar Carl Bowman
    • - + Matthew Avatar Matthew Taylor
    • - + Kasia Avatar Kasia Chmielinski
    • - + Tim Avatar Tim Mickel
    • - + Saskia Avatar Saskia Leggett
    • - + Christan Avatar Christan Balch
    • - + Randy Avatar Randy Jou
    • - + Colby Avatar Colby Gutierrez-Kraybill
    • - + Andrew Avatar Andrew Sliwinski
    • - + Ben Avatar Ben Berg
    • - + Carmelo Avatar Carmelo Presicce
    • - + Moran Avatar Moran Tsur
    • - + Juanita Avatar Juanita Buitrago
    • - + Shruti Avatar Shruti Mohnot
    • - + Hannah Avatar Hannah Cole
    @@ -128,49 +128,54 @@ var Credits = React.createClass({
    • - + Mark Avatar Mark Goff
    • - + Franchette Avatar Franchette Viloria
    • - + Sarah Avatar Sarah Otts
    • - + Jolie Avatar Jolie Castellucci
    • - + Andrea Avatar Andrea Saxman
    • - + Dalton Avatar Dalton Miner
    • - - Megan Haddadi -
      • - -
    • - + Christina Avatar Christina Huang
    • - + Annie Avatar Annie Whitehouse
      • + +
    • + Linda Avatar + Linda Fernsel +
      • + +
    • + Lily Avatar + Lily Kim +

    Previous MIT Scratch Team Members

    @@ -180,8 +185,8 @@ var Credits = React.createClass({ Andrés Monroy-Hernández (who led the development of the first Scratch community website), Amos Blanton, Champika Fernando, Shane Clements, Abdulrahman idlbi, Evelyn Eastmond, Amon Millner, Eric Rosenbaum, Jay Silver, Karen Brennan, Leo Burd, Oren Zuckerman, Gaia Carini, - Michelle Chung, Margarita Dekoli, Dave Feinberg, Chris Graves, Tony Hwang, Di Liu, Tammy Stern, - Lis Sylvan, and Claudia Urrea. + Michelle Chung, Margarita Dekoli, Dave Feinberg, Megan Haddadi, Chris Graves, Tony Hwang, Di Liu, + Tammy Stern, Lis Sylvan, and Claudia Urrea.

    Design and Development Partners

    diff --git a/src/views/credits/credits.scss b/src/views/credits/credits.scss index 7ce371d02..11dc0ded7 100644 --- a/src/views/credits/credits.scss +++ b/src/views/credits/credits.scss @@ -3,8 +3,11 @@ #view { p { line-height: 1.5rem; + a { + word-wrap: break-word; /* Overrides: https://github.com/LLK/scratch-www/blob/develop/src/main.scss#L43-L47 */ + } } - + ul { display: flex; margin: 0; diff --git a/src/views/splash/splash.jsx b/src/views/splash/splash.jsx index b5088e14c..461eba61c 100644 --- a/src/views/splash/splash.jsx +++ b/src/views/splash/splash.jsx @@ -27,12 +27,12 @@ var Splash = injectIntl(React.createClass({ ], getInitialState: function () { return { - projectCount: 10569070, - activity: [], - news: [], - featuredCustom: {}, - featuredGlobal: {}, - showEmailConfirmationModal: false, + projectCount: 'over 13 million', // gets the shared project count + activity: [], // recent social actions taken by users someone is following + news: [], // gets news posts from the scratch Tumblr + featuredCustom: {}, // custom homepage rows, such as "Projects by Scratchers I'm Following" + featuredGlobal: {}, // global homepage rows, such as "Featured Projects" + showEmailConfirmationModal: false, // flag that determines whether to show banner to request email conf. refreshCacheStatus: 'notrequested' }; },