Commit graph

60 commits

Author SHA1 Message Date
Ben Wheeler
edec88f0ab added author username to moderation info area 2018-12-18 10:43:11 -05:00
chrisgarrity
f945897e86
Merge pull request #2470 from chrisgarrity/issue/2318-launch-banner
Issue/2318 launch banner
2018-12-13 11:41:45 -05:00
picklesrus
1ce8ef5b0d
Merge pull request #2449 from picklesrus/download-directly-version
New Download page
2018-12-13 10:26:23 -05:00
Paul Kaplan
ee7acfc9c9 Update add to studio icon 2018-12-12 19:44:35 -05:00
chrisgarrity
79449ac547 [WIP] Draft 3.0 Launch banner
Started transition to ‘featured’ banner that is somewhat reusable. However, middle and smallTop banners are still based on beta. They’re not used for 3.0 launch.
2018-12-12 11:35:41 -05:00
picklesrus
89f382a3c0 compress the svgs with svgo 2018-12-12 09:19:27 -05:00
picklesrus
4716cb3b32 fix all the things 2018-12-11 16:36:17 -05:00
picklesrus
422a5864a2 compress svg 2018-12-10 18:56:34 -05:00
chrisgarrity
f6d54e25b9
Merge pull request #2367 from chrisgarrity/feature/mod-info
Additional project data for Moderators/Admins on the project page
2018-11-30 08:21:15 -05:00
chrisgarrity
e95e5c5f25 Additional project data for Moderators/Admins 2018-11-29 15:43:28 -05:00
Eric Rosenbaum
8260d7bb5d Add Makey Makey extension chip 2018-11-29 15:28:55 -05:00
Paul Kaplan
16e3fa100b
Merge pull request #2313 from paulkaplan/fix-missing-extensions
Add missing extensions and images
2018-11-14 20:31:26 -05:00
chrisgarrity
7e9403d049
Merge pull request #2291 from chrisgarrity/feature/2280-hoc-2018
2018 Hour of Code Banners
2018-11-14 17:10:35 -05:00
Paul Kaplan
194dc90688 Add missing extensions and images 2018-11-14 15:39:40 -05:00
chrisgarrity
a156c404e1 2018 Hour of Code Banners
* add Top and Middle HoC banners
* banners share styles
* add new assets for banners
* update presentation to check date to determine whether to show the HoC banners.
2018-11-07 17:14:28 -05:00
picklesrus
ad564b4ea4 Redo the credits page.
See https://github.com/LLK/scratch-www/issues/2093 for details.
2018-10-21 14:57:12 -04:00
kathy wu
2fd3b3df6f Change scratch link icon
Replace gear icon into newer icon
2018-10-03 10:26:29 -04:00
Linda
c54b7413bc replaced old spinner with new svg to work everywhere where spinner is used 2018-09-12 14:54:15 -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
Ben Wheeler
7cc2f61a2b compressed svgs; small modal scss reversion 2018-07-25 16:30:50 -04:00
Ben Wheeler
d1d42f4245 resolved spinner conflict 2018-07-20 21:14:41 -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
Ben Wheeler
a59d533a1c merged changes in report modal and add to studio handling 2018-07-16 13:39:29 -04:00
Ben Wheeler
6989fd4ecf Added SVGs for add to studio modal 2018-06-27 11:38:32 -04:00
Connor Hudson
7539e74436 Add extension icons, extension info object 2018-06-19 16:13:25 -04:00
chrisgarrity
bd391b422a presentation first pass
First pass at project page design using actual assets from Carl, and matching styles with current design.

Includes a (negative margin) hack to line up the stage. see https://github.com/LLK/scratch-gui/issues/2132
2018-05-31 14:58:23 -04:00
Sean Hickey
9ef187aada Updated conference pages for 2018 2018-05-29 11:07:07 -04:00
chrisgarrity
4fe3997df4 Top and middle banners for HoC 2017
Css animated top banner

Middle banner of activities - responsive

https://github.com/LLK/scratchr2/issues/4869

Also updated ttt see-more/open- modal link to be consistent with the new icon from Carl.
2017-11-03 16:50:26 -04:00
Matthew Taylor
1f722a046f resize svgs 2017-09-08 16:37:18 -04:00
Matthew Taylor
92ed6adead fix typo
thanks @jwzimmer!
2017-09-08 16:08:53 -04:00
Matthew Taylor
9e3823e6e7 add icons to social message notifications 2017-09-08 14:10:46 -04:00
St19_Galla
f3e53ae4c8 Add files via upload 2017-08-02 23:41:45 -04:00
St19_Galla
1817dde96d Delete cards.svg 2017-08-02 23:41:17 -04:00
St19_Galla
200f4a6107 Delete resources.svg 2017-07-31 11:21:40 -04:00
St19_Galla
190abf45e0 Add files via upload 2017-07-31 11:21:19 -04:00
Matthew Taylor
7a2e7cc949 Some additional tweaks for conference 2017
1. Updates svgs for formatting
2. Makes the font size of the title smaller

Fixes #1211, 5-6 in #1206
2017-02-23 09:39:57 -05:00
Matthew Taylor
509d8e84d7 Add new icons
and format accordingly
2017-02-16 16:58:27 -05:00
Matthew Taylor
8b772737a3 Add 2017 conference site 2017-02-15 08:35:10 -05:00
Matthew Taylor
484e3d2544 Add ttt modal component
This assumes that the parent view that renders it will contain the strings that are specific to the ttt element.
2016-11-14 10:31:40 -05:00
Matthew Taylor
b1e37360f3 Refactor modal components
1. Split out base modal stylings from iframe modal stylings
2. Move iframe-specific stylings into a separate copmonent
3. Move width/height iframe stylings to scss
4. Change global stylings for modals to match #980
5. Update styles to use trello style guide
2016-11-14 10:31:40 -05:00
chrisgarrity
ca7d0cf30e Next draft
Includes new SVGs for banner and resources link
MasonryGrid does the reordering of items
Using react-responsive MediaQuery to change columns
Brought in ../forms/button.scss for button styling, and then modified for TTT

Still needs Modal
Final styling pass with Carl
2016-11-09 09:28:59 -05:00
Technoboy10
6cb3d5ceb0 add SVGs for tab icons 2016-08-23 09:26:21 -06:00
Matthew Taylor
feee2f2955 Update conference schedule icons for consistency
from @carljbowman, to @carljbowman
2016-08-02 09:45:36 -04:00
Connor Hudson
5cb46b1579 Merge pull request #601 from technoboy10/educator-landing
Fix GH-311: Educator landing page
2016-06-24 08:21:02 -04:00
Matthew Taylor
1a08e7ae49 Finalize styling for registration flow
/cc @carljbowman

One issue we ran into is that our `frameless` configuration is in `em` rather than `rem`, making it difficult to have an aboslute grid applied uniformly at all hierarchies. For now, we're using straight `rem` calculations instead of `$cols{1,8}` in the styling until we can refactor `frameless` to use `em`.
2016-06-23 14:06:36 -04:00
Connor Hudson
dd249e8b88 add assets for teacher page 2016-06-22 13:18:47 -04:00
Ray Schamp
01b662f77f Merge pull request #567 from rschamp/hotfix/remove-banner
[Develop] Remove Make it Fly banner
2016-06-13 14:43:37 -04:00
Ray Schamp
e2dcd6c647 Remove Make it Fly banner
This reverts commit 7cf3846231, reversing
changes made to afe14ebe88.
2016-06-13 14:35:08 -04:00
Matthew Taylor
0894724dfd Merge branch 'develop' of https://github.com/rthorn/scratch-www into feature/explore-from-rthorn
* 'develop' of https://github.com/rthorn/scratch-www:
  Removed rows from grid, changed explore tabs
  Removed extraneous image file
  Whitespace added
  Small fix
  Support for studios
  Refactoring, new grid component
  Style changes
  Changed path of search page to allow for studio tabs
  Changes to path for search results
  Removed unnecessary files
  Search page functions
  Starting mock of search page
  Fixed problem with loading
  Load button and tabs functioning
  Merge remote-tracking branch 'LLK/develop' into develop
  Early Explore Page

# Conflicts:
#	src/components/navigation/www/navigation.jsx
2016-06-07 09:06:01 -04:00
Ray Schamp
fe08f8c18f Update final graphic 2016-05-26 14:38:56 -04:00