scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-21 04:52:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
13247 commits 221 branches 1 tag 522 MiB
Commit graph

13247 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
ee088e6384 Merge pull request #896 from mewtaylor/issue/gh-825-zip 
Fix GH-825: Only require zip code for US addresses
 2016-08-29 13:14:22 -04:00
Ray Schamp
940ec21d38 Merge pull request #882 from St19Galla/patch-3 
Fix gh-844 // Update Readme
 2016-08-29 13:13:57 -04:00
morant
ecdc544dff Disable lint on require('react') lines as they are required implicitly. 2016-08-29 12:40:17 -04:00
Matthew Taylor
33d06e9721 Merge pull request #865 from St19Galla/patch-2 
Fix gh-864 // Update Conference Text
 2016-08-29 11:57:48 -04:00
morant
2af34efa98 Fix some failed tests. 2016-08-26 15:51:42 -04:00
Matthew Taylor
e7b0415a6b Only require zip code for US addresses 
Since we only check for the US, only require for that country. Other countries have zip codes, but it seems better to do it this way than codify which countries do/do not have zip codes (in case local practices are not the same as international information). Fixes #825
 2016-08-26 11:14:26 -04:00
Matthew Taylor
fae45f191e Merge pull request #873 from TheGrits/patch-2 
Fix gh-853: Update Community Guidelines
 2016-08-26 10:27:47 -04:00
Matthew Taylor
45d206315f Merge pull request #863 from St19Galla/patch-1 
Fix gh-860 // Update FAQ
 2016-08-26 10:27:00 -04:00
Matthew Taylor
85630ffeb4 Merge pull request #880 from LLK/release/2.2.12 
[Develop] Release 2.2.12
 2016-08-26 08:05:00 -04:00
St19_Galla
9a825099a1 update readme 2016-08-25 17:06:10 -04:00
Matthew Taylor
6f8a6eca42 Merge pull request #881 from LLK/release/2.2.12 
[Master] Release 2.2.12
 2016-08-25 15:48:26 -04:00
St19_Galla
5ca03b4e3a remove on from anchor 2016-08-25 08:05:32 -04:00
Matthew Taylor
ab6f8e1049 Add in an Oxford Comma 
*whistles as he commits

see https://github.com/LLK/scratch-www/pull/819#issuecomment-242195194
 2016-08-24 16:39:03 -04:00
Matthew Taylor
846c302abf Merge pull request #877 from mewtaylor/bugfix/grid-alignment 
Bugfix: Align projects in grid to the left
 2016-08-24 11:09:40 -04:00
Matthew Taylor
5dd80c1020 additional reformatting 2016-08-24 10:55:13 -04:00
Matthew Taylor
fb5d9788f8 Re-structure grid styling a bit 
combine stylings where possible, re-name some of the variables to be used more often
 2016-08-24 10:24:01 -04:00
Matthew Taylor
28f96a1d0d Align grid items on the left 
use `flex-start` with margins to ensure proper spacing between, while still starting at the left of each row.
 2016-08-24 10:23:26 -04:00
Matthew Taylor
515bb59bc8 Merge pull request #874 from mewtaylor/bugfix/mobile-meta 
Bugfix: Add `device-width` by default
 2016-08-24 09:07:48 -04:00
Matthew Taylor
9a11e49444 Add device-width by default 
Now that we have mobile nav/footer
 2016-08-24 07:54:08 -04:00
The_Grits
c0c7a1a7e0 Update Community Guidelines 
As per @Paddle2See on #853
 2016-08-23 16:31:43 -04:00
Matthew Taylor
acb363f93f Merge pull request #871 from technoboy10/new-explore-release 
Redesign Explore and Search pages
 2016-08-23 14:28:48 -04:00
Technoboy10
32ef37e3bf remove unused variable 2016-08-23 11:10:02 -06:00
Technoboy10
f0703b9f46 fix styling error 2016-08-23 09:26:22 -06:00
Technoboy10
55f95bb2a8 remove inactive class on tabs 2016-08-23 09:26:22 -06:00
Technoboy10
f27e99f1a4 move card styling to grid.scss, use card as default grid style 2016-08-23 09:26:22 -06:00
Technoboy10
6394d3e8cf make search bar on 4 column layout look right 2016-08-23 09:26:22 -06:00
Technoboy10
647c925a1c search redesign 2016-08-23 09:26:22 -06:00
Technoboy10
4d0efd1268 explore redesign 2016-08-23 09:26:21 -06:00
Technoboy10
017df9da20 redo tabs component 2016-08-23 09:26:21 -06:00
Technoboy10
3fa6fa95fd add card display to grid and thumbnail components 2016-08-23 09:26:21 -06:00
Technoboy10
6cb3d5ceb0 add SVGs for tab icons 2016-08-23 09:26:21 -06:00
Technoboy10
278f7c8819 more tweaks 2016-08-23 09:26:21 -06:00
Technoboy10
cca9b4a7ed style tweaks 2016-08-23 09:26:21 -06:00
Technoboy10
55163d2c86 more work on user avatar in thumbnail 2016-08-23 09:26:21 -06:00
Technoboy10
432b621079 wip 2016-08-23 09:24:44 -06:00
Technoboy10
f883ecfbae commit changes 2016-08-23 09:24:44 -06:00
Matthew Taylor
f714f8711e Merge pull request #869 from mewtaylor/bugfix/abkhaz-language 
Bugfix: Add Abkhaz language to custom locales
 2016-08-22 16:38:01 -04:00
Matthew Taylor
3ab92e0c36 capitalize one more language 
existing, but needs it
 2016-08-22 16:33:06 -04:00
Matthew Taylor
9657262daa Capitalize other languages 
per https://github.com/LLK/scratchr2/pull/3954#issuecomment-241529290
 2016-08-22 16:01:17 -04:00
Matthew Taylor
af2165a697 Add Abkhaz to custom locale list 
it’s not in `intl-messageformat`. Give it Azerbaijani as a parent language for now, as they have similar enough structures for plualization/alphabet purposes.
 2016-08-22 15:55:43 -04:00
morant
191d78fab3 Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/microworlds 2016-08-22 13:43:04 -04:00
morant
28aa4f0b2c Fixing microword pages and adding routes to them. 
- Remove temp "open in Scratch" button, now that we have a permanent one.
- Fix microworld pages to work with new changes to environment.
- Fix alignment issues.
- Connect routes to microworld pages.
- Add soccer microworld.
- Comment out videos and tips from arts microworls, so it can be shown publicly.
 2016-08-22 13:31:44 -04:00
St19_Galla
2123fc9af8 Updates 2016-08-22 11:04:31 -04:00
St19_Galla
ceb6b38106 whoops 2016-08-22 09:46:47 -04:00
St19_Galla
4f3f978b86 Update FAQ 2016-08-22 09:41:44 -04:00
Matthew Taylor
13bb61679a Merge pull request #858 from mewtaylor/bugfix/select-field-alignment 
Bugfix: align gender/organization type input msg with other messages
 2016-08-22 09:35:52 -04:00
Matthew Taylor
70eb82f7cb remove .card-specific stylings 2016-08-19 15:16:35 -04:00
Matthew Taylor
baf0676f99 move .validation-message out` 
It doesn’t need to be specifically styled, as we have no use for it inside `.card` but outside `.row` yet. Thanks @rschamp!
 2016-08-19 15:06:12 -04:00
Matthew Taylor
bc0263531b align gender/org input msg with others 
Because the `input` field is already to the right, they were being transformed too far over. This overrides the transform to be correct, and also scopes some css in more detail
 2016-08-19 14:11:24 -04:00
Matthew Taylor
db2b7ebc34 Merge pull request #851 from St19Galla/patch-1 
Fix GH-850 // Add image links
 2016-08-19 06:42:40 -04:00