Commit graph

1608 commits

Author SHA1 Message Date
Joel Gritter
a1504a1733
fix(gh-6002): fix cursor for ideas tile images
- update styling the TTTTile object to make the cursor a pointer on hover of the TTTTile image
2022-01-27 07:03:50 -05:00
Maximouse
55fa30e904 Use bold instead 2022-01-23 11:23:42 +01:00
Maximouse
1887b4dac7 Make author username alignment consistent on Explore and search 2022-01-10 11:09:21 +01:00
Maximouse
2bd58a32ce Use className 2022-01-09 16:50:42 +01:00
Maximouse
cdf44e0219 Increase max-width of studio titles on Explore and search 2022-01-09 14:30:45 +01:00
Maximouse
7157057bab Use font weight 500 consistently for teacher registration form labels 2022-01-09 14:15:29 +01:00
Karishma Chadha
f272af1034
Revert "Revert "Unconfirmed user link hotfix"" 2022-01-06 17:21:32 -05:00
Tom Lum
816d68de73
Revert "Unconfirmed user link hotfix" 2022-01-05 16:25:40 -05:00
Tom Lum
5477fbdbc1
Updates link in email confirmation modal 2022-01-05 16:18:45 -05:00
tomlum
62c9d1b46f css class refactor 2021-12-17 14:22:46 -05:00
seotts
0239276644 Change class name to "modal-text-content" 2021-12-17 13:30:49 -05:00
tomlum
1364e4400f css fixes and refactors 2021-12-17 13:13:36 -05:00
seotts
cb3864c67a Update ids in modal tests 2021-12-17 13:13:36 -05:00
seotts
938f3f4dbf Put tips in a list 2021-12-17 13:13:36 -05:00
seotts
fa42938247 Rename l10n ids to refer to components 2021-12-17 13:13:36 -05:00
seotts
7f2b756aba Localize email confirmation banner 2021-12-17 13:13:36 -05:00
tomlum
a2938d18eb fixes line length lint 2021-12-17 13:13:36 -05:00
seotts
92824f43aa Use onRequestClose instead of handleClose 2021-12-17 13:13:36 -05:00
seotts
2af9b673ff Wire up EmailConfirmationModal's close button 2021-12-17 13:13:30 -05:00
seotts
8b62fb9f63 Give EmailConfirmModal email address prop 2021-12-17 13:13:30 -05:00
seotts
f7008f533d Make all banners sticky 2021-12-17 13:09:46 -05:00
seotts
7a51bded90 Add banner css; make sticky 2021-12-17 13:09:46 -05:00
tomlum
85e5342748 email confirmation modal styling 2021-12-17 13:09:46 -05:00
tomlum
5b58c3822c in progress, tests, banner, modal 2021-12-17 13:09:46 -05:00
tomlum
058edef86a adds modal progress and new logic for showing share button on project page 2021-12-17 13:09:46 -05:00
tomlum
f17ee45ceb basic pages and profile picture and confetti 2021-12-14 12:31:26 -05:00
Karishma Chadha
1d68765c48 More layout, and font-size fixes for annual report. 2021-11-15 17:07:56 -05:00
Karishma Chadha
c835c67fe7 Updates to TextAndMediaSnippet layout, spacing, and some font sizing. Fix width of components of other sections e.g. Scratch in India. 2021-11-15 17:07:56 -05:00
Karishma Chadha
c60705d8f5
Merge pull request #6229 from bocoup/annual-report-2020
Annual Report Fixes
2021-10-29 17:57:32 -04:00
caseymm
f44ddbe7d3 fix video disappearing after fullscreen is entered and exited 2021-10-28 15:39:49 -07:00
Karishma Chadha
41b40810a1
Merge pull request #6228 from bocoup/annual-report-2020
Annual report 2020
2021-10-28 17:21:11 -04:00
caseymm
739c001f66 fix string and move a few things around. add better breakpoint for timeline 2021-10-28 14:04:29 -07:00
Karishma Chadha
2916d7e4cf
Merge pull request #6206 from bocoup/annual-report-2020
Annual report 2020
2021-10-26 18:18:44 -04:00
caseymm
3d44e562d3 iframe sizing 2021-10-22 15:25:56 -07:00
Karishma Chadha
0d5a44aa2c
Merge pull request #6131 from bocoup/annual-report-2020
Annual report 2020
2021-10-22 16:51:20 -04:00
caseymm
7557655a06 remove paragraph prop 2021-10-22 13:28:17 -07:00
caseymm
60a98a7a92 fix string links and rename splashes 2021-10-22 12:53:33 -07:00
caseymm
f8bdd8948b spinner color and correcting other errors 2021-10-21 16:42:22 -07:00
caseymm
ae4ecca386 i10n changes 2021-10-21 16:12:54 -07:00
caseymm
37dba60b1c links in paragraphs 2021-10-21 15:41:10 -07:00
caseymm
b460e9bb80 replace some images and start adding links to paragraphs 2021-10-21 15:10:47 -07:00
caseymm
fc47304527 finish all alt tags 2021-10-20 12:38:40 -07:00
caseymm
0e32b6c9c3 alts for video previews and country blurb sections 2021-10-20 11:22:52 -07:00
caseymm
2016380b34 add alts for india grid 2021-10-20 10:55:24 -07:00
caseymm
d3aa437444 styling 2021-10-19 16:27:42 -07:00
caseymm
4c29cb5dcc misc styling changes 2021-10-18 15:37:37 -07:00
caseymm
33132818c0 lint 2021-10-18 14:03:38 -07:00
caseymm
be9175aa64 misc timeline fixes 2021-10-18 14:00:11 -07:00
caseymm
0ed82b35c8 video buttons 2021-10-18 13:32:00 -07:00
Sarah Otts
e0a5ae5c68
Merge pull request #5884 from jeffalo/dont-search-empty-strings
Prevent searches for empty strings
2021-10-18 16:16:15 -04:00
caseymm
cb67a918d2 force autoplay on videos 2021-10-18 10:15:32 -07:00
caseymm
83760a522e tutorial lines and tile links 2021-10-15 16:39:06 -07:00
caseymm
95b7d13d08 update people.json 2021-10-15 14:45:02 -07:00
caseymm
520bf41968 fix linting 2021-10-15 12:47:58 -07:00
caseymm
7160befa55 update map 2021-10-15 12:06:10 -07:00
caseymm
a56631c267 bg images for year in review 2021-10-14 10:28:05 -07:00
caseymm
6366cbd4b2 spacing and bottom wave 2021-10-13 17:03:28 -07:00
caseymm
7d4621576f year in review cards 2021-10-13 16:33:51 -07:00
caseymm
6f1688d399 embed some projects 2021-10-13 10:55:29 -07:00
caseymm
19e65e9f0e items in for adapation 2021-10-12 15:39:52 -07:00
Sarah Otts
c30252a4ed
Merge pull request #5882 from apple502j/move-faq-url
Move FAQ page to /faq
2021-10-12 16:34:41 -04:00
caseymm
a45c1b6700 finish content in connectivity section 2021-10-05 15:27:11 -07:00
caseymm
4dbe0d20f0 country sections 2021-10-05 11:52:50 -07:00
Sarah Otts
23be853cb0
Merge pull request #5114 from benjiwheeler/shrink-splash-image
converted images around splash video to png, smaller file size
2021-09-20 14:06:25 -04:00
Eric Rosenbaum
a8b7961f66 alerts default to 6 seconds 2021-08-20 14:04:09 -04:00
jeffalo
feb80afb35 revert 2021-08-06 12:29:00 +02:00
jeffalo
992baf7745 see if returning null will fix errors 2021-08-06 12:26:56 +02:00
jeffalo
dbf68ff9b4 satisfy eslint 2021-08-05 21:33:59 +02:00
jeffalo
e1afa432a2 also don't allow only whitespace 2021-08-05 21:18:36 +02:00
jeffalo
7e1aebf9b4 prevent searches for empty strings 2021-08-05 21:12:22 +02:00
apple502j
9a390eafeb
Move FAQ page to /faq 2021-08-06 02:55:11 +09:00
Ray Schamp
a17919e561
Merge pull request #5496 from rschamp/rearrange-conference-2021
Bump Conference 2020 to 2021 (Take 2)
2021-06-14 09:01:51 -04:00
picklesrus
ef801112cd
Merge branch 'develop' into project-comments 2021-06-07 15:38:40 -04:00
picklesrus
993dd36aa5 WIP of being able to turn off project comments. 2021-06-07 11:28:29 -04:00
Paul Kaplan
cb8a869e4f Merge branch 'develop' into muted-users-cant-edit-studios 2021-05-26 10:58:12 -04:00
rschamp
31e6616544 Rename all Conference 2020 folders to 2021
This is both to reduce confusion in the future, and so that Transifex sees what it expects, with the name of the resource corresponding to the path to the l10n file.
2021-05-26 10:22:12 -04:00
Paul Kaplan
832324ea83
Merge pull request #5451 from paulkaplan/studio-alerts
Alert component and studio error and success alerts
2021-05-24 15:33:10 -04:00
Bryce Taylor
bfe64aa313
Merge pull request #4540 from BryceLTaylor/move-navbar-tests
Move Navbar integration tests from Tap to Jest
2021-05-24 10:57:21 -04:00
seotts
19a9997e0f Muted users can’t edit studios
linting fixes
2021-05-21 09:46:19 -04:00
Eric Rosenbaum
a7ab994638 use buttons in subnav to make keyboard nav work 2021-05-20 17:12:27 -04:00
Paul Kaplan
e2eb8611b1 Dont catch pointer events in the alert container 2021-05-19 13:46:06 -04:00
Paul Kaplan
5ee1c7c203 Add reusable alert component using context 2021-05-19 13:33:41 -04:00
Paul Kaplan
31655d7f11 Fix issue where multiple overflow menus could be opened at once 2021-05-14 12:25:04 -04:00
Paul Kaplan
8bc026a958
Merge pull request #5381 from paulkaplan/studio-tile-overflow-menu
Studio tile overflow menu
2021-05-14 09:30:56 -04:00
Paul Kaplan
e9728b8a13
Merge pull request #5388 from paulkaplan/studio-project-errors
Add error display for studio curator and project adder inputs
2021-05-14 09:30:42 -04:00
DD Liu
dffcbebc37 Switch the checkbox to a toggle slider for studio comments allowed 2021-05-13 15:46:34 -04:00
Paul Kaplan
d35c539529 Add validation messages for title, image and description 2021-05-13 10:36:40 -04:00
Ben Wheeler
316f26bed5 rename .close-button style to not conflict 2021-05-12 14:14:34 -04:00
Paul Kaplan
8dddb393a7 Add overflow menu and show example on components page 2021-05-12 10:53:52 -04:00
Ben Wheeler
3dd69c287c Remove stale comments, remove extra space, add padding 2021-05-07 22:23:45 -04:00
Ben Wheeler
23f2135c17 add donate banner, make close button a mode of button component 2021-05-07 11:50:47 -04:00
BryceLTaylor
7a5bdc0400 Change class for search input wrapper to search-wrapper 2021-04-06 14:19:05 -04:00
BryceLTaylor
0cd1f6e6be Add class to searchbar for automated tests 2021-04-06 14:19:05 -04:00
Ben Wheeler
491735b9f0 use smaller svgs instead of pngs 2021-03-30 21:32:54 -04:00
Eric Rosenbaum
33b7d87840 update grid json 2021-03-30 10:52:57 -04:00
Eric Rosenbaum
82d759e30a grid displays “Project Title” 2021-03-24 16:12:37 -04:00
Eric Rosenbaum
9466a7b75b add grid 2021-03-23 16:58:38 -04:00
Eric Rosenbaum
10f9194f61 fix form and carousel enough to display them 2021-03-22 17:24:18 -04:00
chrisgarrity
8271bb62bb
Merge pull request #5141 from seotts/prevent-feedback-when-not-just-muted
Prevent feedback when not just muted
2021-03-15 09:10:48 -04:00
seotts
936172d70b only show feedback link for new mute
Add variable for isBad string
2021-03-11 13:06:51 -05:00
seotts
a1759f42b3 Revert "Revert "Content updates march 2021""
This reverts commit 65f69d1201.
2021-03-09 14:38:36 -05:00
Ben Wheeler
4533c983fd converted images around splash video to png, smaller file size 2021-03-09 10:15:44 -05:00
Sarah Otts
65f69d1201
Revert "Content updates march 2021" 2021-03-03 15:39:25 -05:00
Sarah Otts
4a625a634a
Merge pull request #5078 from zoebentley/content-updates-jan-2021
Content updates march 2021
2021-03-02 16:57:26 -05:00
seotts
ec3a205dea Create Plotly bundle to load only choropleth
lint
2021-03-01 16:22:02 -05:00
Paul Kaplan
b0390f36a2 Fix lint and missing components 2021-02-26 11:01:13 -05:00
Paul Kaplan
0353135cc4 Split phone number step to reduce bundle for other registration pages 2021-02-26 10:31:20 -05:00
Paul Kaplan
da2ca40ccf Only require libphonenumber when rendering phone inputs 2021-02-26 10:31:19 -05:00
Zoë Bentley
118ffadb76 Changed images on About page and changed many text strings 2021-02-19 12:04:13 -05:00
Zoë Bentley
1caa1da81f Began making changes to Credits page 2021-02-19 12:04:13 -05:00
Paul Kaplan
56345874e3 Mark deprecated methods with UNSAFE_ prefix 2021-02-19 11:12:00 -05:00
Karishma Chadha
2d932a7979
Merge pull request #5002 from LLK/hotfix/dependency-updates
[Develop] Hotfix/dependency updates
2021-02-16 11:34:23 -05:00
Karishma Chadha
ca392e6d5b Fix lint errors related to eslint-config-scratch update 2021-02-16 10:54:50 -05:00
seotts
5a3250edd5 Fix proptype of startStep 2021-02-11 15:14:51 -05:00
seotts
e23b27abc6 send automod feedback to api 2021-02-10 16:20:58 -05:00
picklesrus
92667c097d Add tests and expose steps enum so it can be referenced from outside MuteModal 2021-02-04 11:13:30 -05:00
picklesrus
f7bf204924 Draft: open mute modal from reply button if you're muted. 2021-02-02 11:34:27 -05:00
Sarah Otts
f60a8c71a0
Merge pull request #4901 from seotts/automod-feedback-modal
Automod feedback modal steps
2021-02-02 08:58:47 -05:00
seotts
ba99d49298 Fix FeedbackForm tests + other small fixes
Add strings
2021-02-01 15:50:55 -05:00
seotts
42eb195b57 move feedback form to its own component 2021-01-28 15:45:00 -05:00
seotts
a037395689 Merge branch 'automod-feedback-modal' of https://github.com/seotts/scratch-www into seotts-automod-feedback-modal
# Conflicts:
#	src/components/modal/mute/modal.jsx
#	src/components/modal/mute/modal.scss
#	src/l10n.json
2021-01-26 15:27:05 -05:00
Chris Garrity
1afa2a3e33 Adjust formatting of the comment status box
Reduce the width of the comment status paragraphs to make them easier to read. Ensure that the bottom text is still below all other text by making it 100% width.
2021-01-26 08:58:01 -05:00
seotts
9df36b0fcf add tests for feedback form, clean-up form 2021-01-25 17:52:59 -05:00
seotts
f2a3dfda1b Revert "Revert "Use formik for feedback form""
This reverts commit c22c2c967b.
2021-01-22 15:14:21 -05:00
seotts
037f91e76c Revert "Revert "Add feedback step using a Formsy textarea""
This reverts commit 1bc3aaf0ee.
2021-01-22 15:14:06 -05:00
seotts
1bc3aaf0ee Revert "Add feedback step using a Formsy textarea"
This reverts commit 5e4fc154c6.
2021-01-22 15:12:14 -05:00
seotts
c22c2c967b Revert "Use formik for feedback form"
This reverts commit 512358e9af.
2021-01-22 15:12:14 -05:00
seotts
b42966ac6a Revert "Add feedback step using a Formsy textarea"
This reverts commit 5e4fc154c6.
2021-01-22 12:13:40 -05:00
seotts
af56e2389c Revert "Use formik for feedback form"
This reverts commit 512358e9af.
2021-01-22 12:13:03 -05:00
seotts
512358e9af Use formik for feedback form
cleanup
2021-01-22 11:58:56 -05:00
seotts
5e4fc154c6 Add feedback step using a Formsy textarea 2021-01-22 11:58:56 -05:00
picklesrus
4879570561 Update vertical spacing on mute modal
This reduces the vertical padding in the mute modal to better fit on shorter screens.
2021-01-07 11:07:39 -05:00
Karishma Chadha
090312bf56
Merge pull request #4736 from seotts/world-map-fix
World map fixes - Border thickness, Eswatini, remove unused css
2021-01-06 10:43:50 -05:00
Sarah Otts
78d001e127
Merge pull request #4737 from seotts/team-new-tabs
In the Annual Report Team section, open link to Scratch Team members in new tab
2021-01-05 14:38:03 -05:00
Sarah Otts
b9892ff6d8
Merge branch 'develop' into automod-new-messaging 2021-01-04 11:09:29 -05:00
picklesrus
9037f8817a
Merge pull request #4774 from picklesrus/warning-mute
Show warning message when user has been muted several times.
2020-12-21 08:36:21 -05:00
seotts
7e140b3832 add new mute messages
Get correct mute message info for modal

remove extra spapce
2020-12-18 10:24:43 -05:00
picklesrus
d8ad0c38ea Show warning message when user has been muted several times. 2020-12-17 15:43:07 -05:00
picklesrus
1aca3c0f25
Merge pull request #4768 from picklesrus/fix-prop-warning
Fix prop type. muteStepContent is an array not a string.
2020-12-17 10:00:26 -05:00
Benjamin Wheeler
aeaca81fb7
Merge pull request #4686 from benjiwheeler/api-check-username
switch educator registration checkusername endpoint from scratchr2 to api
2020-12-16 20:43:19 -05:00
picklesrus
760082d2d7 Fix prop type. muteStepContent is an array not a string. 2020-12-16 07:54:20 -05:00
Chris Garrity
501147060d Update generic message copy
Updated copy requres two paragraphs in the content. Modified the inputs to pass a content array and output one paragraph per item.
2020-12-11 09:52:30 -05:00
Chris Garrity
929e670d8f Internationalize the mute messages
Add formatted messages for comment status and mute modal
2020-12-11 08:44:17 -05:00
seotts
b7cf82494b Remove unused variable and fix spacing 2020-12-07 16:16:42 -05:00
picklesrus
f4f6b70f2e
Merge branch 'develop' into readable-time 2020-12-07 16:05:02 -05:00
seotts
1d70ee243c Make borders smaller, show data for Eswatini 2020-12-07 12:45:01 -05:00
seotts
86650e1ce9 open link to Scratch Team member in new tab 2020-12-07 12:43:43 -05:00
picklesrus
b450d36a64 Redo time based on new requirements. 2020-11-30 16:16:52 -05:00
Sarah Otts
fec148ac74
Merge pull request #4682 from LLK/annual-report-video-spinner
Add loading spinner in Annual Report
2020-11-25 15:29:11 -05:00
Ben Wheeler
590873c765 switch educator registration checkusername endpoint from scratchr2 to api 2020-11-24 13:54:11 -05:00