Commit graph

2855 commits

Author SHA1 Message Date
Linda
253d6ac279 style fix 2018-08-22 13:32:23 -04:00
Linda
d4ad8f7d35 add language tag 2018-08-22 13:05:49 -04:00
Linda
9a91fa9b0a h2 in header is now h1, including overwritten styles 2018-08-22 10:45:19 -04:00
Linda
c26dc79b8d add alt tags to remaining images and correct some 2018-08-22 10:21:28 -04:00
Linda
83553c3bc2 making the conditional translation more elegant 2018-08-21 16:40:49 -04:00
Linda
25234d7e27 add conditional alt attributes to ev3 landing page installation step 2018-08-21 16:33:50 -04:00
Linda
bf5a890a87 added alt attributes to img tags in starter projects component and when using this component on ev3 page 2018-08-21 16:07:27 -04:00
Italy
1ff394f9b2 adding simple alt attributes to imgs on ev3 landing page 2018-08-21 15:39:59 -04:00
Italy
9d171a6880 Merge remote-tracking branch 'upstream/develop' into develop 2018-08-20 13:11:59 -04:00
Ray Schamp
9a76c8fde4
Merge pull request #2027 from LLK/update-scratch-gui
Update packages after installing
2018-08-17 10:47:14 -04:00
Ray Schamp
eefc56527d
Update packages after installing
This will bring in the latest version of anything not explicitly pinned, notably scratch-gui
2018-08-17 10:41:57 -04:00
Ray Schamp
d105cb4406
Merge pull request #2026 from LLK/enable-backpack
Configure backpack, project, and asset hosts for dev/staging/production
2018-08-16 18:02:55 -04:00
Ray Schamp
a3c929db3d Finish setup of backpack, assets, projects hosts 2018-08-16 17:40:09 -04:00
Ray Schamp
d538412357 WIP: configure GUI for staging 2018-08-16 17:39:04 -04:00
Ray Schamp
a19fb29f36 WIP: enable backpack in preview 2018-08-16 17:37:19 -04:00
Ray Schamp
fccbed0782
Merge pull request #2021 from technoboy10/preview-hide-intro-modal
Hide intro modal in editor on new project page
2018-08-16 17:02:57 -04:00
Benjamin Wheeler
b52fb3951e
Merge pull request #2017 from benjiwheeler/stage_header_padding
project page stage margin, width adjustments to match gui css changes
2018-08-15 00:20:44 -04:00
Ben Wheeler
466b53b518 project page stage margin and width adjustments to match gui stage css changes 2018-08-13 23:48:27 -04:00
Connor Hudson
d795d87e18 Hide intro modal in editor on new project page 2018-08-09 15:50:31 -04:00
Benjamin Wheeler
0114d3ea2f
Merge pull request #2015 from benjiwheeler/report_project_endpoint
report project POSTs to scratchr2, displays modal reactively
2018-08-09 12:50:36 -04:00
Ben Wheeler
2c8990ae7e report project POSTs to scratchr2, displays modal reactively 2018-08-09 12:41:38 -04:00
Connor Hudson
1875870a86
Initial implementation for displaying comments on project page (#1997)
* Create Comment component, start styling it

* Restructure PreviewPresentation to better match mockup

* Add padding, border to comment bubble

* add padding to bottom row of comment

* Tweak alignment of avatar and comment content

* Add margin to lower project page container

* Use border-box box sizing for comment bubble

* Make user avatar a link

* Add initial implementation of comment tail

* Align username row properly, fix comment bubble width

* Use ::before pseudoelement for comment tail

* Remove unused props to Comment component

* Add CommentContainer to handle comment replies

* Use CommentContainer instead of Comment in PreviewPresentation

* Remove debug data from CommentContainer

* Fetch top level comments from the API

* Force comment container to stretch to bottom of view div

* Remove unused api import in CommentContainer

* Long words in comments should not overflow page

* Remove @ before username in comment title

* Fix word wrapping on Firefox

* Refactor CommentContainer into a class

* Properly export CommentContainer component

* Make replies column take up proper width

* Pass project ID to CommentContainer

* Fetch comment replies in CommentContainer

* Initial implementation for loading more comments

* Add "Load More" button to Presentation

* Initial implementation of collapsing threads longer than 3 replies

* Remove console log from preview.js redux

* Tweak last comment gradient color

* Only show three total replies in collapsed state

* Match scratchr2 behavior for thread collapsing

* Use width calc instead of margin and width 100%

* Fix styling for load more button

* Make comment border gray to match the wireframe

* Allow clicking through comment fade gradient

* Add comment compose component

* style comment compose box

* Style post, cancel buttons on comment compose component

* Add margin to create comment container

* Tweak styling for characters remaining text

* Tweak placeholder text

* Add more margin to comment avatar

* Add icons and styling to delete, report text

* Refactor px -> rem where possible in comment styles

* Change comment time color to dark gray

* Tweak margin and border radius

* Add reply icon to preview comments

* Clean up unused imports, console.log in compose-comment component

* Remove console statement in preview.jsx

* Add some clarifying comments to unfinished parts of comments

* Remove direct passing of comment api response to CommentContainer

* CommentContainer should not pass api response directly

* Rename CommentContainer to TopLevelComment

* First pass at getReplies for comments in redux

* Move reply fetching into redux actions instead of in TopLevelComment

* Refactor getReplies logic to behave better

* Remove components not directly related to reading comments

* Hide load more button if all comments are loaded
This uses the project info returned by the API

* Use same gradient as add to studio modal on comment thread
2018-08-06 11:52:18 -04:00
Connor Hudson
7742eccb87
Add missing l10n strings to EV3 page (#2013) 2018-08-03 17:29:15 -04:00
Benjamin Wheeler
f76ca8b891
Merge pull request #1985 from benjiwheeler/studio-modal-benwheeler
Add To Studio modal on project page. Sorry for merge commit, merges from develop made these un-squashable :(
2018-08-02 17:53:53 -04:00
Connor Hudson
de2691762e
Refactor Extension Landing Pages (#2006)
* Add extension-landing generalized styles, install scratch link component

* Make EV3 page use generalized stuff

* Use OS_ENUM file instead of class variable

* use extension-landing/os-enum in os chooser

* Use extension-landing class in extension-landing.scss

* Use extension-landing styles and components on microbit page

* Add view-specific styles

* Move install scratch link l10n strings to src/l10n.json

* Start moving steps display to its own components

* Finish initial pass at Step, Steps components for extension landing pages

* Create ProjectCard component

* Use new components on InstallScratchLInk component

* Use new components on EV3 page

* allow className prop in Steps component

* Use new components on micro:bit landing page

* imageUrl -> imageSrc in ProjectCard

* Create ExtensionHeader component and use it on micro:bit and EV3 pages

* Fix a spacing issue in the InstallScratchLink component

* Add ExtensionRequirements component

* Use ExtensionRequirements component on landing pages

* Remove requirements l10n string for ev3 page

* Move project card styles out of things-to-try section

* Don't render the number row in a step if compact and number props are not set

* Add ExtensionSection component

* Use ExtensionSection on ev3 and microbit pages

* Move state configuration to ExtensionLanding class

* Move tip box, screenshot styles outside of specific section

* Add TipBox component and use it on the EV3 page

* Use hr element instead of section-separator div

* Remove refactor TODO comments :)
2018-08-02 13:09:55 -04:00
Connor Hudson
afde4597d0
Merge pull request #2010 from technoboy10/bugfix/tablet-banner-centering
[DEVELOP] Fix top banner centering on android chrome
2018-08-01 16:45:52 -04:00
Ben Wheeler
d941ec1dff do not modify state object directly 2018-08-01 16:37:48 -04:00
Ben Wheeler
7aa81199ce modal halo 2018-08-01 15:53:53 -04:00
Benjamin Wheeler
08453f9f7c
Merge branch 'develop' into studio-modal-benwheeler 2018-08-01 14:46:33 -04:00
carljbowman
35af52c40c
Merge pull request #2007 from carljbowman/develop
Remove Darken and Ligthen SCSS
2018-08-01 14:44:19 -04:00
Ben Wheeler
4ce72ce61f consolidated colors per consult with Carl 2018-08-01 14:42:15 -04:00
Ben Wheeler
38f4c6a5c3 rearranged colors; longer studio button names 2018-08-01 11:01:37 -04:00
Connor Hudson
d48adc2ae4 Set more position properties to fix banner centering on android chrome 2018-08-01 10:26:26 -04:00
Ben Wheeler
5fab657fad Merge remote-tracking branch 'origin/develop' into studio-modal-benwheeler 2018-08-01 10:14:09 -04:00
Ben Wheeler
ea3d69330b removed package-lock.json 2018-08-01 09:54:01 -04:00
Ben Wheeler
c450b7e658 corrected brackets for lint error 2018-07-31 18:10:42 -04:00
Ben Wheeler
e83f29dbbc moved NaN check in preview.jsx to be guard-style 2018-07-31 16:38:49 -04:00
carljbowman
3352f8a7f0 Add missing semicolon 2018-07-31 15:33:34 -04:00
carljbowman
e3e422714e Fix 2017 conference banner
Updates the light blue background to a dark blue. Give the text more contrast.
2018-07-31 15:33:11 -04:00
carljbowman
e41d16e656 Fix button contrast in Tips page masthead
Previously the button was made aqua, but there was a lot of contrast between the ui-blue and ui-aqua.
2018-07-31 15:32:29 -04:00
Ben Wheeler
d5e1401968 reverted docker-compose fallback 2018-07-31 15:06:12 -04:00
Ben Wheeler
097fb66955 currentStudioIds now an array; reverted a few changes 2018-07-31 15:00:56 -04:00
carljbowman
6a8676ea35 Remove Darken and Ligthen SCSS
Updated all the places in the SCSS where we use Darken and Lighten properties.

These properties have been problematic in the past and caused some state issues, e.g. New message(s) hightlight (which was fixed seperately from this issue)
2018-07-31 14:37:49 -04:00
chrisgarrity
4b3d6b9e9d
Merge pull request #1964 from JoelGritter/JoelGritter-patch-1
Fix gh-1962: Update footer wiki link
2018-07-31 08:08:55 -04:00
chrisgarrity
409b452200
Merge pull request #1979 from joker314/feature/add-bryce-taylor
Add brycedtea to Credits page
2018-07-31 08:08:21 -04:00
chrisgarrity
08e45c076f
Merge pull request #1980 from GreenBayRules/develop
Add Kathy Wu to Credits
2018-07-31 08:07:49 -04:00
Ben Wheeler
8eec0d3a87 corrected parentheses for lint error 2018-07-27 10:49:42 -04:00
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