scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-04 12:51:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3524 commits 216 branches 1 tag 485 MiB
Commit graph

3524 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Sliwinski
a0d4e1c1b6
Merge pull request #1973 from Kenny2github/patch-1 
Added Community Moderator job listing
 2018-07-18 11:39:53 -04:00
Colby Gutierrez-Kraybill
2dd9d5a27e watchOptions required for use in docker environment 
This will work in both docker and outside of docker, and tunes the load on a docker container running webpack to not overly burden a local host’s cpu watching for changes. By default, webpack-dev-middleware is supposed to be watching, but in practice this seems to not be the case in docker containers, as fsevents are not passed through the NFS mount into a container and it requires explicit polling to enable watching for changes.
 2018-07-18 11:37:58 -04:00
Ken
d95058a1bc
Added Community Moderator job listing 
Closes #1972
 2018-07-18 17:17:59 +02:00
Andrew Sliwinski
41242c3a46
Merge pull request #1971 from technoboy10/bugfix/preview-route-alias 
Remove extra characters from preview faq routeAlias
 2018-07-17 10:40:20 -04:00
Connor Hudson
61cfbb90e6 Remove extra characters from preview faq redirect routeAlias 2018-07-17 10:36:13 -04:00
Andrew Sliwinski
61bfc254ce
Merge pull request #1956 from technoboy10/feature/beta-banner 
Add top and middle splash page banners for beta launch
 2018-07-17 09:46:14 -04:00
Andrew Sliwinski
cdeb9f5049
Merge pull request #1970 from carljbowman/develop 
Update WWW to unify color and typography with scratch-gui
 2018-07-17 09:42:54 -04:00
carljbowman
ef9b726f63 Replace last remaining HEX colors in _colors.scss 
There were a few colors used in the logged-out Welcome message. Replaced them with new 3.0 colors.
 2018-07-17 09:26:46 -04:00
carljbowman
9d87d8700c Remove custom color in What’s Happening Callout 
Swapped colors to make it more consistent.
 2018-07-17 09:15:17 -04:00
carljbowman
cf7149a356 Fix linting 2018-07-16 19:25:35 -04:00
carljbowman
12c0706dbb Modify load more button 
With box-shadows being removed from buttons there were a few places that needed to be adjusted: white buttons on light gray backdrop
 2018-07-16 18:06:15 -04:00
carljbowman
201517a32d Remove shadows on buttons 
GET OUT OF HERE BOX SHADOWS.
 2018-07-16 18:05:10 -04:00
carljbowman
5a067132b6 Remove numeric font-weights 
We have seen lots of issues across browsers with font-weights defined as numbers (e.g. 400 vs regular).

Updated one place that was effected by new line lengths and wrapping issues.
 2018-07-16 18:04:43 -04:00
carljbowman
ebd41b169e Update colors to match 3.0 palette 
Updates maintain WWW color variable naming conventions, but replaces values with 3.0 colors.

Colors have the commented HEX and GUI variable name.

More work to do auditing but it’s a start.
 2018-07-16 18:02:12 -04:00
Ben Wheeler
a59d533a1c merged changes in report modal and add to studio handling 2018-07-16 13:39:29 -04:00
Connor Hudson
90bd2af3aa Move banner timestamps to constants at top of file 2018-07-16 13:16:48 -04:00
Connor Hudson
a669106796 Redirect /preview-faq -> /3faq, remove "Preview" from faq title 2018-07-16 12:47:18 -04:00
Connor Hudson
595a4a8c60 Hide banners before launch date (actual dates TBD) 2018-07-16 11:35:25 -04:00
Bryce Taylor
656b22f713
Merge pull request #1958 from joker314/develop 
Remove unneeded testing file
 2018-07-16 10:28:20 -04:00
Connor Hudson
664fc1998e Update beta banner styles to match mockup 2018-07-16 10:09:34 -04:00
Connor Hudson
ae49bbf74f Update l10n strings 2018-07-16 10:09:10 -04:00
Connor Hudson
fee657977e Use module.exports for banners, remove .default for banner imports in presentation 2018-07-16 09:17:26 -04:00
Colby Gutierrez-Kraybill
a047207e00
Merge pull request #1965 from colbygk/update_docker_compose 
Update to track changes in docker-compose behavior
 2018-07-13 13:52:49 -04:00
Ben Wheeler
bc7b31e924 finished draft of intermediary refactor of addtostudio modal redux code, container-presentation code simplified 2018-07-13 09:50:17 -04:00
Ray Schamp
f7970efcdc Merge branch 'release/june-2018' of github.com:LLK/scratch-www into develop 2018-07-12 10:02:23 -04:00
Ray Schamp
5e64a4aacc
Merge pull request #1952 from LLK/release/june-2018 
Release for June 2018
 2018-07-12 09:41:46 -04:00
BryceLTaylor
a46fd34e0d Make Travis run tests on all branches 2018-07-11 15:11:36 -04:00
Ben Wheeler
6a32edb2fe addtostudiomodal: incomplete progress on 1. container-presentation refactor, 2. redux handling of add and leave studio requests 2018-07-11 15:08:01 -04:00
BryceLTaylor
417ce0996e Use Travis’s built in CI environment variable for tests 2018-07-11 14:50:04 -04:00
BryceLTaylor
fb8e0292ce Use Travis build Number rather than ID 2018-07-11 13:21:57 -04:00
BryceLTaylor
b1fa09eef9 Include Travis build id in Sauce Labs test name 2018-07-11 12:07:28 -04:00
BryceLTaylor
90d10dd417 Name Sauce Labs tests to indicate when run by Travis 2018-07-11 11:17:49 -04:00
BryceLTaylor
58ba061c66 Make Travis use Saucelabs 2018-07-11 11:14:44 -04:00
Colby Gutierrez-Kraybill
64d254e869 FALLBACK should reference localhost not docker specific scratchr2-app end point 2018-07-11 11:10:38 -04:00
Colby Gutierrez-Kraybill
9c35b80073 Update to track changes in docker-compose behavior 
docker-compose no longer strips `-` from the project name, which makes `scratchapi` now `scratch-api` when referencing the network.
 2018-07-11 10:42:09 -04:00
Joel Gritter
90ab0f75d0
Update wiki link 2018-07-10 17:29:25 -04:00
Ray Schamp
ae5d825c37 Merge branch 'hotfix/update-conference-2018-3' into release/june-2018 2018-07-09 16:35:50 -04:00
Ray Schamp
5844fed2e0 Merge branch 'hotfix/update-conference-2018-3' into develop 2018-07-09 16:34:23 -04:00
chrisgarrity
78b49c5f30
Merge pull request #1954 from LLK/hotfix/update-conference-2018-3 
[MASTER] Conference site updates - schedule, logos, room locations
 2018-07-09 16:28:01 -04:00
Bryce Taylor
d251a73672
Merge pull request #1953 from BryceLTaylor/Update-Integration-README 
Update integration readme with Sauce Labs information
 2018-07-09 10:51:45 -04:00
jokebookservice1
07202ff6ec
Remove unneeded testing file 2018-07-09 16:48:17 +03:00
Andrew Sliwinski
f3bd092482
Merge pull request #1951 from JoelGritter/JoelGritter-patch-1 
Fix gh-1950: Update parent email age on FAQ page
 2018-07-09 08:47:24 -04:00
Ben Wheeler
9cac70ab18 small steps towards addtostudio modal's container-presentation refactor 2018-07-07 14:09:43 -04:00
Connor Hudson
5b520c21ef Update copy from doc 2018-07-06 13:47:55 -04:00
Connor Hudson
a7aae29041 Tweak small top banner styles 2018-07-06 11:38:41 -04:00
Connor Hudson
917497ab66 Use localization strings for banner copy 2018-07-06 10:37:51 -04:00
Connor Hudson
565eeb776f Make middle banner image resize properly and keep its aspect ratio 2018-07-06 10:37:10 -04:00
BryceLTaylor
2bb898788f Update Intergration README to have Saucelabs info 2018-07-06 10:33:40 -04:00
BryceLTaylor
ba5ac92b00 Adjust how smoke tests are called in package.json 2018-07-06 10:32:59 -04:00
Sean Hickey
377eaf0e61 Conference updates - schedule, logos, room locations 2018-07-06 10:17:57 -04:00