scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-12 08:41:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
685 commits 221 branches 1 tag 507 MiB
Commit graph

184 commits

Author SHA1 Message Date
Matthew Taylor
f05cb39501 Add flex-row component 
Just a container with some default flexbox formatting.
 2016-04-21 16:21:22 -04:00
Matthew Taylor
3c8a7db834 Take margins out of typography 
They won't be the same margins for text-heavy and text-lite pages, so we should make thess view-specific for now
 2016-04-21 16:19:20 -04:00
Matthew Taylor
eed6f1fc08 Restructure src 
1. Put formatting-specific components into the `presentation` subdir of `components`
2. Put content-specific components into the `container` subdir of `components`
3. Put views that are sub-urls of the site into a subdir of `views` (i.e. `microworlds`, and eventually `conference`)
 2016-04-21 15:46:32 -04:00
Matthew Taylor
a6e199b5f4 Merge pull request #414 from TheGrits/patch-4 
Fix gh-413: Update supporting organizations
 2016-04-15 16:22:54 -04:00
The_Grits
c9492ae38b Update l10n.json 2016-04-15 16:12:17 -04:00
The_Grits
08ccaa7721 Spaces and Intel 2016-04-15 15:59:32 -04:00
The_Grits
1a2e30fccd mailto anchor 2016-04-15 15:58:11 -04:00
The_Grits
d6b08a0bff Add Chris and Julia 
As per https://github.com/LLK/scratch-www/issues/413#issuecomment-209889924
 2016-04-14 12:36:20 -04:00
The_Grits
174b351845 Delete the extra space 2016-04-09 14:28:05 -04:00
Matthew Taylor
7aeaaeb480 Wrap wedo2 view in page component 2016-04-07 16:49:35 -04:00
The_Grits
855154edcf Update CN url 
As per https://github.com/LLK/scratch-www/pull/414#issuecomment-206880466
 2016-04-07 09:36:45 -04:00
The_Grits
6d349cb7f9 Update supporting organizations 
Changed according to #413
 2016-04-06 17:49:30 -04:00
The_Grits
09d095b963 Change supporting organizations 
As per #413.
Specific additions:
- Cartoon Network
- Lemann Foundation
 2016-04-06 17:42:05 -04:00
Matthew Taylor
27b55082f0 Merge pull request #407 from mewtaylor/issue/gh-406-counselor-link 
GH-406: Add community counselor job
 2016-04-04 14:55:36 -04:00
Ray Schamp
53e508dd24 Merge pull request #411 from sayamindu/develop 
Add view for community blocks interview recruitment
 2016-04-01 16:34:57 -04:00
Sayamindu Dasgupta
bd81438800 Add view for community blocks interview recruitment 
We are recruiting Scratchers for interviews on the Scratch Community
blocks feature; this is a part of my PhD disseration. This commit has
the PDF forms and the views that are needed for the recruitment.
 2016-04-01 13:23:48 -04:00
Matthew Taylor
7734ee8931 Add community counselor job 
Fixes #406
 2016-04-01 10:29:13 -04:00
Matthew Taylor
1adb8ecf5b Add page component to jobs view 
Fixes #398
 2016-03-28 14:18:44 -04:00
Ray Schamp
78649b69e2 Merge pull request #353 from morantsur/feature/microworlds 
Moving Microworlds pages to scratch-www & adding arts
 2016-03-25 15:43:10 -04:00
Ray Schamp
042ef65070 Merge pull request #393 from rschamp/feature/silence 
Upgrade sass-lint, quiet various warnings
 2016-03-24 12:02:40 -04:00
Ray Schamp
19f469db48 Upgrade and quiet sass-linter 
These warnings were annoying me because the noise makes it easy to miss real issues.

The `no-mergeable-selectors` rule is one that we do want to have, but right now it asks that you merge selectors in different `@media` blocks.  When the next release happens we should put that back.

https://github.com/sasstools/sass-lint/issues/307

Similarly, we want `force-element-nesting` but there is a problem with that because there's no easy way to have a nested selector in a list of selectors.
https://github.com/sasstools/sass-lint/issues/575

Finally, until they implement per-line overrides, we have to silence `class-name-format` because we don't have control over the ReactModal class names.  It's a useful rule to keep class names consistent though.  Per-line ignores should be coming soon: https://github.com/sasstools/sass-lint/issues/70
 2016-03-23 18:34:54 -04:00
Matthew Taylor
56787ee09c Add spot check for cards, use new Page paradigm 2016-03-23 16:47:55 -04:00
Matthew Taylor
b903067658 Update the cards with new grouped structure 2016-03-23 16:37:15 -04:00
Matthew Taylor
f95b62bf67 Change name to cards to prevent interaction fx 
thanks @rschamp !
 2016-03-23 16:37:15 -04:00
Matthew Taylor
5d693ed53d Add /info/cards/ route 
Also implements a method for handling translation of static files as described in https://github.com/LLK/scratch-www/issues/372#issuecomment-193350144
 2016-03-23 16:37:15 -04:00
Matthew Taylor
4914ba6d85 Use formatNumber to localize project count 
`toLocaleString()` is not supported in Safari, but react-intl has a polyfill, and so it is. This also localized the intro description string, which wasn't previously. This also fixes #366 by doing as @rschamp suggested and checking if the count is the default count before setting the value.
 2016-03-22 11:00:37 -04:00
Ray Schamp
7b72e6cdcd Fix lint errors 2016-03-18 12:40:30 -04:00
Ray Schamp
a5e336a175 Use redux for session handling 2016-03-18 11:51:22 -04:00
Ray Schamp
faabc63e65 Move component structure to one tree 
Instead of inserting `Navigation` and `Footer` into every `render`ed component, just compose them in the views with a new `Page` component.
 2016-03-18 10:54:26 -04:00
morant
2e5a0e1439 Merge remote-tracking branch 'upstream/develop' into feature/microworlds 
* Removed microwords from server/routes for now.

# Conflicts:
#	server/routes.json
#	src/components/thumbnail/thumbnail.jsx
 2016-03-11 21:14:27 -05:00
Matthew Taylor
cb81ae550a Merge pull request #382 from mewtaylor/hotfix/wedo-appstore-link 
[Develop] Hotfix: wedo appstore link
 2016-03-10 15:28:50 -05:00
Matthew Taylor
c514d814c9 Update device manager app store link 2016-03-10 15:14:08 -05:00
Matthew Taylor
b484480e1e Merge branch 'wedo-landing' into develop 
* wedo-landing:
  Update with links, fix linter issues, center setup
  [WIP] Add WeDo Landing page

# Conflicts:
#	server/routes.json
 2016-03-10 09:05:51 -05:00
Matthew Taylor
aeaa02aae8 Update with links, fix linter issues, center setup 2016-03-09 23:04:25 -05:00
carljbowman
3220fd1b9d [WIP] Add WeDo Landing page 
Adding LEGO WeDO landing page. This also includes the initial pass on Global Typographic Standards.

Needs Work
-Add URLs to all links on the page (still being generated)
-Ater URLs have been added, update translation JSON to include messages that include links
 2016-03-09 14:33:17 -05:00
Andrew Sliwinski
47ab0a0ae0 Update jobs to match Media Lab listings 2016-03-02 09:42:51 -05:00
Andrew Sliwinski
7511121972 Merge branch 'develop' into feature/jobs 2016-03-01 10:19:34 -05:00
Matthew Taylor
0ac9f5edc5 Merge pull request #359 from TheGrits/patch-2 
Fix gh-357: Splash - Initial value of project count is arbitrary
 2016-02-23 11:43:26 -05:00
morant
c7cc1b626f Revert "Revert "Fix review comments, and organize code a bit."" 
This reverts commit e9cb08d273.
 2016-02-19 15:11:23 -05:00
morant
e9cb08d273 Revert "Fix review comments, and organize code a bit." 
This reverts commit 3d9d280bb9.
 2016-02-19 14:39:43 -05:00
morant
3d9d280bb9 Fix review comments, and organize code a bit. 
The only visible change should be that the tips thumbnails are no longer links.
 2016-02-19 14:30:07 -05:00
The_Grits
8d05ed84b4 singlequotes 
Apparently double quotes don't work
 2016-02-18 14:34:02 -05:00
The_Grits
9f2325bd83 "over 13 million" 
Changed as per @mewtaylor's suggestion
 2016-02-18 14:29:58 -05:00
The_Grits
7992c43b87 Update credits.jsx 
Travis was complaining that link 188 had over 120 characters, this should fix it.
 2016-02-12 07:37:25 -05:00
Matthew Taylor
212a2d2c41 Merge pull request #352 from technoboy10/gh333-creditspage 
Fix gh-333: Add/Remove Moderators on Credits Page
 2016-02-10 22:51:54 -05:00
The_Grits
91f3de0682 link formatting in paragraphs 2016-02-08 14:50:56 -05:00
The_Grits
53cf85a4c2 Update project count 
Updated the number with a more recent number, I wasn't sure if using a string like "Loading..." would damage anything.
 2016-02-08 10:04:38 -05:00
The_Grits
3939dde44e Update credits.scss 2016-02-08 08:10:41 -05:00
The_Grits
2a6f30cdb7 word-wrap for p elements 
Should fix #354, I'll test on a local machine.
 2016-02-05 07:59:09 -05:00
Technoboy10
e1b9cf5716 Removed Megan Haddadi, added Linda and Lily 2016-02-03 08:36:05 -07:00