Commit graph

3809 commits

Author SHA1 Message Date
Ben Wheeler
a60da11f8a curated studios endpoint doesn't pass unnecessary token to api 2018-07-26 18:54:58 -04:00
Ben Wheeler
7cc2f61a2b compressed svgs; small modal scss reversion 2018-07-25 16:30:50 -04:00
Ben Wheeler
1a4922a262 addtostudio buttons in own component; currentStudioIds redux object; lint fixes 2018-07-25 15:08:12 -04:00
Ray Schamp
49edbc5bfe
Merge pull request #1995 from LLK/hotfix/conference-2018-livestream
[Develop] Conference 2018 Livestream
2018-07-25 11:08:43 -04:00
Ray Schamp
7d424580b7
Merge pull request #1994 from LLK/hotfix/conference-2018-livestream
[Master] Conference 2018 Livestream
2018-07-25 11:08:12 -04:00
Sean Hickey
767fabb22c Updated livestream link to proper URL 2018-07-24 12:12:17 -04:00
Ben Wheeler
0c6b8607da better approach to tracking which studios the project current belongs to 2018-07-24 11:50:03 -04:00
Ben Wheeler
66c21d8b33 merged docker-compose 2018-07-24 09:29:07 -04:00
Ben Wheeler
ffe5e8cb43 adding distinct object to redux/preview.js state to track studio membership 2018-07-24 09:12:13 -04:00
Sean Hickey
8ab5656e33 Added link to keynote livestream 2018-07-23 16:49:13 -04:00
Bryce Taylor
4f927b1d38
Merge pull request #1968 from LLK/travis
Make Travis run smoke tests with Saucelabs
2018-07-23 14:47:08 -04:00
Ben Wheeler
52281502b2 corrected mismatched addtostudio field name in redux/preview.js 2018-07-23 10:39:20 -04:00
Ben Wheeler
f176835df6 removed whitespace 2018-07-23 09:50:26 -04:00
Colby Gutierrez-Kraybill
21d2f73bd7
Merge pull request #1975 from colbygk/docker_ergonomics
watchOptions required for use in docker environment
2018-07-23 09:50:21 -04:00
chrisgarrity
05f368a2e7
Merge pull request #1993 from LLK/develop
[HOTFIX] Fix new message highlight.
2018-07-23 09:35:59 -04:00
Andrew Sliwinski
1d282a4846
Merge pull request #1990 from carljbowman/develop
Fix new message highlight
2018-07-21 11:19:45 -04:00
carljbowman
7de1cb80d6 Fix new message highlight
New messages should now have a blue backgroud (like they did previously).
2018-07-21 09:55:08 -04:00
Ben Wheeler
d1d42f4245 resolved spinner conflict 2018-07-20 21:14:41 -04:00
Ben Wheeler
1ad7ce4f4c resolved version conflicts 2018-07-20 21:08:33 -04:00
Ben Wheeler
fc5912526e addtostudio modal interfaces with api add/remove endpoints; waits to close; handles open studios that user does not curate.
addtostudio modal interfaces with api add/remove endpoints; waits to close; handles open studios that user does not curate.
2018-07-20 20:37:36 -04:00
chrisgarrity
11d25bbe11
Merge pull request #1983 from LLK/develop
Pre-conference Release (July 2018)
2018-07-20 13:47:27 -04:00
Connor Hudson
5f0016f385
Add landing pages for the micro:bit and EV3 extensions (#1981)
* start building ev3 landing page structure

* Inject translations, add more content and structure to ev3 landing page

* Add ev3 route

* add active styles for os chooser buttons

* Add ev3 assets

* Add content and intial styles for everything down to "Sample Projects"

* Add correct padding to all sections on ev3 page

* Add more margins to match the mockup

* Create os chooser component for reuse on other landing pages

* Make EV3 page stateful, add OS logic, change step styles, fix images on Chrome

* Add sample project cards and styles

* Add fixed ev3 icon svg

* Add app store badges (no href on links yet)

* Add section separator, fix sample project card margins

* Add border to project cards, make project cards clickable links

* Add FAQ boilerplate and styling from InformationPage component

* Add indented ol style, example

* Add link style with underline

* Add EV3 retail link

* Content updates

* Fix some z-index issues with os chooser

* micro:bit page mega-commit

* os chooser should not have a higher z-index than nav

* Update starter projects

* Localize OS chooser

* Add localization configuration for EV3 page

* Localize section titles on ev3 page

* Add starter project images and descriptions

* Add link to microbit.org

* Fix tip box width on microbit and ev3 pages

* add l10n strings up to things to try on ev3 page

* Fix lint error in ev3.scss

* Add download link style to ev3

* microbit getting started text and images

* Remove tip about microbit name

* Hex file and starter project download links

* microbit wording updates

* update images

* Fix issues with download link style

* text fix

* Add ev3 starter project downloads

* Add microbit l10n file and config

* Add l10n strings for microbit header and scratch link sections

* Add l10n strings for microbit page up to faq

* content updates

* Fix some page overflow issues

* microbit faq content and style

* Use zipped version of microbit hex file

* Add platform name to scratch link download button

* Add EV3 faq to l10n.json

* Add final strings from micro:bit and EV3 pages to l10n.json files

* Add white download asset

* Tweak styles for ev3 and microbit

* Add some final tweaks to the EV3 page styles

* Add TODO comments about refactoring duplicate code
2018-07-19 18:08:44 -04:00
Sheshank Shankar
3c020d9200
Update credits.jsx 2018-07-19 10:57:09 -07:00
Sheshank Shankar
a5070bfda5
Remove trailing spaces 2018-07-19 09:08:20 -07:00
Sheshank Shankar
4de9b49d2a
Bug fix 2018-07-19 09:07:08 -07:00
Sheshank Shankar
7b205fb136
Add Kathy Wu to credits 2018-07-19 08:59:43 -07:00
jokebookservice1
0f5778cab9 Add brycedtea to Credits page 2018-07-19 18:54:50 +03:00
chrisgarrity
fa3f968e33
Merge pull request #1976 from chrisgarrity/issue/remove-conference-l10n
remove obsolete tx/config for conference
2018-07-19 09:04:51 -04:00
Colby Gutierrez-Kraybill
5bf674a440 Move the eslint ignore from Makefile lint rule to into .eslintignore 2018-07-19 08:48:44 -04:00
chrisgarrity
674e7b3342 remove obsolete tx/config for conference
We forgot to remove the conference l10n file from the tx config when the file was removed. It causes transifex to quit with an error, so research and preview weren’t getting sent to transifex/updated.
2018-07-18 21:43:19 -04:00
Ben Wheeler
cf63c35e94 interface with api add/remove project to/from studio works; addtostudio modal waits to close 2018-07-18 18:52:15 -04:00
Colby Gutierrez-Kraybill
cd8d951fd6 Linting tests will not work if scratch-gui is linked directly into local directory
We’re currently linking scratch-gui directly into the scratch-www directory (either through a bind mount in docker) or a symoblic link in unix. This causes the current make lint target to fail when it attempts to look in that directory for lint targets. Also, don’t bother linting node_modules
2018-07-18 16:02:22 -04:00
Colby Gutierrez-Kraybill
19e141fc0e Fix linting issue with space after comma 2018-07-18 16:00:34 -04:00
Colby Gutierrez-Kraybill
a76e36054c Move watchOptions into middlewareOptions
This creates middlewareOptions and a check on USE_DOCKER_WATCHOPTIONS as a pathway to have docker containers use polling for file system updates.
2018-07-18 11:49:52 -04:00
Colby Gutierrez-Kraybill
1624c92ef4 Add USE_DOCKER_WATCHOPTIONS
Let docker containers to make use of watchOptions and polling
2018-07-18 11:48:52 -04:00
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