Commit graph

5101 commits

Author SHA1 Message Date
tomlum
9ff89c5d0a lint refactor 2022-06-08 09:50:33 -04:00
tomlum
fa8e1c9ab1 adds clarifying comment 2022-06-08 09:43:52 -04:00
tomlum
ec7f8735f1 moves const 2022-06-07 17:28:42 -04:00
tomlum
7a52cedae1 replaces isNewProject 2022-06-07 17:08:36 -04:00
tomlum
6aca8d6e23 adds condition for loading projects 2022-06-07 12:37:05 -04:00
tomlum
60965bd24b adds changes from previous PR 2022-06-06 15:49:54 -04:00
tomlum
99e3a469a1 Merge branch 'develop' of https://github.com/LLK/scratch-www into hotfix/project-token 2022-06-06 13:48:38 -04:00
tomlum
aed6b7b2a0 lint fix 2022-06-06 09:54:31 -04:00
tomlum
409dfbdc36 deploy to staging 2022-06-06 09:47:03 -04:00
tomlum
82cadf1a7b adds fix for new project from old project 2022-06-02 15:14:06 -04:00
tomlum
2d921cb78a refactors project token check for new projects 2022-06-02 15:02:26 -04:00
tomlum
dc656f496b work on load project fix 2022-06-02 14:07:02 -04:00
tomlum
316db7f4e8 passes correct token to gui 2022-05-31 16:29:29 -04:00
picklesrus
e896c60f9a
Revert "Send fastly token to gui" 2022-05-24 17:01:54 -04:00
picklesrus
979022e372
Revert "Adds check for newly created project to not require token" 2022-05-24 16:59:46 -04:00
tomlum
4319820a72 lint fix 2022-05-24 14:19:46 -04:00
tomlum
16ae1a5d0f adds check for newly created project to not require token 2022-05-24 14:06:41 -04:00
seotts
7281f65d97 Fix “Creative Expression” description copy in annual report 2022-05-24 10:41:40 -04:00
tomlum
0465ba334d Merge branch 'develop' of https://github.com/LLK/scratch-www into send-fastly-token-to-gui 2022-05-23 10:45:42 -04:00
tomlum
5ca9978ce6 adds token to projectshape 2022-05-23 10:35:34 -04:00
tomlum
330ff3692a adds token to embed view 2022-05-23 10:29:59 -04:00
Sarah Otts
9f619551f0
Merge pull request #6672 from JoelGritter/patch-1
fix(gh-6377): fix typos in alt text
2022-05-19 13:32:00 -04:00
Sarah Otts
1c4e3f4c56
Merge pull request #6673 from JoelGritter/patch-2
fix(gh-6316): make links open in new tabs
2022-05-19 13:29:21 -04:00
seotts
5c985f297f Open internal links in same tab 2022-05-19 13:28:59 -04:00
tomlum
c4231fd178 Merge branch 'master' of https://github.com/LLK/scratch-www into send-fastly-token-to-gui 2022-05-13 14:58:33 -04:00
tomlum
09a2832215 renames getprojectdata to loadprojectdata 2022-05-13 14:51:52 -04:00
Sarah Otts
d28f64bc37
Merge pull request #6781 from seotts/annual-report-route-update
Switch /annual-report to 2021 report!
2022-05-11 09:15:06 -04:00
seotts
412fb2988b remove unnessesary comment 2022-05-10 14:16:04 -04:00
seotts
6dad747671 Add margin to reach intro for small screens 2022-05-10 12:00:44 -04:00
seotts
57650fdf56 Clean up Bridges to Science spotlight 2022-05-10 11:32:47 -04:00
seotts
ce7e080916 Fix wrapping and padding of SEC blob
p
2022-05-09 17:04:54 -04:00
seotts
3750166b4f Use h3 in a bunch of spots instead of h4 2022-05-09 16:35:52 -04:00
seotts
65c9588aae Switch /annual-report to 2021 report! 2022-05-09 14:27:03 -04:00
seotts
f8cc0a6e9d Remove bananas 🍌 2022-05-09 12:17:05 -04:00
seotts
52eb20cdae Bridges to Science location bolded 2022-05-09 11:59:34 -04:00
seotts
4bfe9e67a3 Fix bridges to science title copy 2022-05-09 11:48:52 -04:00
seotts
d6baafa181 Make masthead/director message breakpoint consistant 2022-05-09 10:48:33 -04:00
seotts
0854825136 Director message alignment 2022-05-09 10:48:33 -04:00
seotts
528b6a2405 Color/width/alignment in founder message & overall h2 size 2022-05-09 10:48:33 -04:00
seotts
3e287d41e0 Use larger fort (18px) for some paragraphs, per spec 2022-05-06 16:41:35 -04:00
rschamp
9eb1b44098 Don’t fetch project metadata until we have the token 2022-05-06 14:36:14 -04:00
rschamp
8b4c692e33 Set token for project metadata request 2022-05-06 14:13:55 -04:00
rschamp
6f457ff1da Serialize embed view project requests 2022-05-06 14:13:35 -04:00
seotts
a22da02cc2 Bold pull quotes 2022-05-06 13:06:17 -04:00
rschamp
09cf1e1e68 Ensure token is available before rendering GUI 2022-05-06 11:37:57 -04:00
rschamp
ee8cccbf31 Fix lint 2022-05-06 11:37:34 -04:00
rschamp
ea5ecbfc35 Remove WIP code 2022-05-06 11:17:35 -04:00
seotts
f9c2039b39 In-kind symbol alignment 2022-05-06 11:08:37 -04:00
seotts
af7fa38149 Strategic Framework alignment and spacing 2022-05-06 10:39:58 -04:00
seotts
411566b1ce Scratch Lab intro spacing 2022-05-05 16:09:46 -04:00
seotts
12b79b3b16 Scratch Lab image alignment 2022-05-05 15:36:03 -04:00
tomlum
063489b704 adds fastly token to gui 2022-05-05 15:24:17 -04:00
seotts
9a291df074 Reach header spacing 2022-05-05 15:18:29 -04:00
seotts
61a6c8f50c Fix 10 New Languages spacing 2022-05-05 14:33:03 -04:00
seotts
b58fd120a3 SEC spotlight spacing & g-jedi illustration 2022-05-05 14:24:36 -04:00
seotts
36158b3952 Gray spinner for asl video 2022-05-05 14:12:12 -04:00
seotts
220511ee07 Reach section vertical spacing 2022-05-05 12:01:03 -04:00
seotts
9eef5668fd Change Scratch Lab spinner and button color 2022-05-05 11:39:50 -04:00
seotts
2cc54f2b35 Copy fix in Scratch Week card 2022-05-05 11:24:46 -04:00
seotts
259df95754 Update Elaine’s username in AR and Credits page 2022-05-05 10:58:03 -04:00
seotts
3031b8247f Add links for april fools and scratch week 2022-05-05 10:56:14 -04:00
seotts
14ea5f40a3 Fix alignment and naming of timeline illustrations 2022-05-05 10:48:57 -04:00
seotts
9c3fef3785 Add overflow-wrap for long German words 2022-05-05 10:34:36 -04:00
Sarah Otts
b7b504d6d0
Merge pull request #6760 from bocoup/2021-annual-report
2021 annual report
2022-05-03 16:38:33 -04:00
caseymm
55b1b4a275 update supporters copy 2022-05-03 13:37:09 -07:00
caseymm
cc6eeabc8c fix spacing on SEC workshops 2022-05-03 11:11:48 -07:00
caseymm
70010982e3 allowtransparency and dotted connector alignment 2022-05-03 10:54:54 -07:00
caseymm
fa28743d10 fix alignment of green tag in themes section 2022-05-02 13:55:03 -07:00
caseymm
f0b2f59d4b fix open/close eslint max-len disable/enable 2022-05-02 13:46:56 -07:00
caseymm
b5ef6a6309 alt text 2022-05-02 13:24:01 -07:00
caseymm
384a8e60a5 add tag component and fix linting 2022-05-02 12:04:07 -07:00
caseymm
d68536a3be fix strings 2022-05-02 11:13:46 -07:00
caseymm
8300698fe0 style and i10n 2022-05-02 11:08:02 -07:00
caseymm
0fd4c06cc3 css tweaks 2022-05-02 09:51:18 -07:00
Sarah Otts
611de01b61
Merge pull request #6757 from bocoup/2021-annual-report
2021 annual report
2022-05-02 10:22:45 -04:00
Sarah Otts
0d07cf5c44
Merge pull request #6753 from seotts/annual-report-intl-file
Make /annual-report use localization file of 2020 report
2022-04-29 17:17:55 -04:00
caseymm
527003703c content alignment 2022-04-29 13:15:05 -07:00
caseymm
9a62939680 through scracth team on yt 2022-04-29 11:02:51 -07:00
caseymm
27e60171e4 timeline spacing 2022-04-29 10:12:00 -07:00
picklesrus
c681b4dac3
Merge pull request #6755 from picklesrus/banner-update
Update donate banner for Scratch celebration.
2022-04-29 09:45:38 -04:00
caseymm
ca5ed3e19c margins 2022-04-28 17:46:43 -07:00
caseymm
f403bee5ab tweaks 2022-04-28 17:28:15 -07:00
caseymm
c419ac71d3 some timeline work 2022-04-28 16:59:55 -07:00
picklesrus
0566724640 Make it start now and stop after may 21 2022-04-28 17:25:53 -04:00
picklesrus
29bbd5c720 Update donate banner for Scratch celebration. 2022-04-28 17:10:54 -04:00
caseymm
5ee959e185 images and aqua bg 2022-04-28 13:54:57 -07:00
seotts
c30f99c0da Add optional “intlName” route attribute for annual report 2022-04-28 14:31:07 -04:00
caseymm
240d6c0c87 start working on sparkles 2022-04-27 12:18:50 -07:00
seotts
11be5ee3f7 Change placeholder name 2022-04-27 10:30:47 -04:00
Sarah Otts
51d8a182ff
Merge pull request #6738 from bocoup/2021-annual-report
2021 annual report (QA through map section)
2022-04-27 10:26:03 -04:00
caseymm
7295ea98ef alignment through Volunteer Translators 2022-04-26 14:37:23 -07:00
caseymm
52f216ee98 work up to community 2022-04-26 11:47:25 -07:00
picklesrus
4d4a2f87b2
Merge pull request #6741 from picklesrus/update-image-link
Serve images from uploads instead of cdn2.
2022-04-26 12:55:04 -04:00
caseymm
6c3dc25c11 work on fullshear spotlight story 2022-04-25 16:36:14 -07:00
picklesrus
3224d25a7e Add messages for scratch week banner so they can be translated. Banner changes coming in a later PR. 2022-04-25 16:40:16 -04:00
picklesrus
96650c3fe0 Serve images from uploads instead of cdn2. cdn2 redirects to uploads already anyway. 2022-04-21 14:54:41 -04:00
caseymm
4821a03baf through map section 2022-04-15 13:03:21 -07:00
caseymm
6279acb267 alignment through emerging themes 2022-04-15 12:57:26 -07:00
caseymm
4453edac93 through saudi arabia 2022-04-14 16:43:46 -07:00
seotts
604238d1a0 Revert "Merge pull request #6731 from LLK/studios-rtl"
This reverts commit 830a2e3ebf, reversing
changes made to 1a2d1db3a1.
2022-04-13 16:17:49 -04:00
picklesrus
ef299efc7f
Merge pull request #6646 from mxmou/compose-spacing
Correct comment compose spacing
2022-04-13 09:48:10 -04:00
Sarah Otts
8335935375
Merge pull request #6728 from bocoup/2021-annual-report
2021 annual report
2022-04-13 09:17:11 -04:00
caseymm
c92893ebad new supporters text 2022-04-12 17:58:21 -07:00
caseymm
ce300564e8 finish new content and clean out old items from i10n 2022-04-12 17:51:15 -07:00
caseymm
a516fc5bdc more work on community section 2022-04-12 13:48:26 -07:00
caseymm
9eb0f0a0d7 country org lists 2022-04-12 12:04:03 -07:00
caseymm
22d1283247 add org json 2022-04-11 18:22:13 -07:00
seotts
c6c9505476 Display studio RTL for RTL languages 2022-04-11 17:01:59 -04:00
caseymm
d6da78db95 fix linting 2022-04-08 11:56:18 -07:00
caseymm
a01349f05d more work on access and start community 2022-04-08 11:48:44 -07:00
caseymm
ee4130331e work on access 2022-04-07 16:51:08 -07:00
caseymm
7a8898717b map and spotlight 2022-04-06 15:45:41 -07:00
caseymm
279be7977e start sec 2022-04-06 14:09:10 -07:00
caseymm
20cf588745 finish reach section 2022-04-05 16:19:58 -07:00
caseymm
e1b05563db more sections 2022-04-05 15:28:18 -07:00
caseymm
7f91908d56 mission pieces and images in 2022-04-05 14:29:41 -07:00
caseymm
660fc7094d start mission 2022-03-31 17:28:23 -07:00
caseymm
a88fd38fc4 init setup 2022-03-30 15:20:15 -07:00
Karishma Chadha
b2dfd0fa0f Update name in annual report team section 2022-03-22 16:40:59 -04:00
Karishma Chadha
dc1a025de9 Update people on credits page 2022-03-22 16:40:00 -04:00
Tom Lum
93e31c32ea
Merge pull request #6687 from tomlum/conference-page-banner-adjustment
adjusts navigation height and banner image
2022-03-22 15:42:02 -04:00
tomlum
61dada8282 adjusts navigation height and banner image 2022-03-22 14:57:45 -04:00
Tom Lum
8c79e7f0a3
Merge pull request #6671 from kchadha/conference-page-banner-update
Update banner image on 2022 conference page
2022-03-22 14:36:10 -04:00
JoelGritter
45223cfea5 chore(gh-6316): lint errors
- why didn't they show up in VScode before?!
2022-03-18 20:53:25 -04:00
JoelGritter
5973b914e4 fix(gh-6316): make links open in new tabs
- if a link is a) external, or b) embedded within a paragraph, make the link open in a new tab
2022-03-18 20:45:50 -04:00
Joel Gritter
26be194350
fix(gh-6377): fix typos in alt text 2022-03-18 17:46:55 -04:00
Tom Lum
d1b92fca65
Merge pull request #6505 from webdev03/patch-1
fix: question mark at the end of faq header missing
2022-03-18 16:51:17 -04:00
Karishma Chadha
9e359c203c Update banner image on 2022 conference page 2022-03-18 16:46:39 -04:00
Tom Lum
61bd06ac78
Merge pull request #6451 from mxmou/explore-search-left-align
Make author username alignment consistent on Explore and search
2022-03-18 16:41:15 -04:00
Tom Lum
6471832f7c
Merge pull request #6447 from mxmou/search-thumbnail-title-full-width
Increase max-width of studio titles on Explore and search
2022-03-18 16:28:47 -04:00
Sarah Otts
0d8a5a63ba
Merge pull request #6478 from JoelGritter/patch-2
fix(gh-6002): fix cursor for ideas tile images
2022-03-17 13:36:05 -04:00
Karishma Chadha
8ebd8121e0 Update date and time for conference and padding around 'stay tuned' 2022-03-16 17:29:56 -04:00
Karishma Chadha
96f2ba67d5 Move shared image to a shared folder 2022-03-16 10:43:57 -04:00
Karishma Chadha
90a9075dbf Add 2022 conference page. Refactor a bit of 2021 conference code so we don't have to create duplicate componenets 2022-03-15 18:22:40 -04:00
Maximouse
050c8ce9ea Fix studio comment issues on narrow screens 2022-03-15 15:17:17 +01:00
Maximouse
2d7a448829 Fix reply input indentation and alignment 2022-03-15 13:46:08 +01:00
Maximouse
4738774011 Correct comment compose spacing 2022-03-15 13:00:08 +01:00
Maximouse
ea7f3cb770 Fix Explore/search tile overflow when avatars don't load 2022-03-15 11:25:17 +01:00
rschamp
930bb78304 Handle Totally Normal™ flags 2022-03-11 14:22:43 -05:00
BryceLTaylor
e7c696de76 Fix format of url of caret.svg in language selector
also caret-hover.svg
2022-03-08 10:52:06 -05:00
Sarah Otts
0a88b93012
Merge pull request #6469 from JoelGritter/patch-1
fix(gh-4969): add missing period to l10n string
2022-03-03 13:56:50 -05:00
Sarah Otts
af1d42f4fd
Merge pull request #6449 from mxmou/project-instructions-left-align
Left-align project instructions and notes on medium window widths
2022-03-03 13:53:49 -05:00
Sarah Otts
092153ca2c
Merge pull request #6445 from mxmou/focus-reply-textarea
Focus comment reply textarea when it appears
2022-03-03 13:44:08 -05:00
rschamp
b648f82585 Remove expired Mandrill outage warning banner 2022-03-02 11:55:38 -05:00
Tom Lum
56a9b2b7e8
Merge pull request #6500 from tomlum/scratcher-onboarding
Scratcher Onboarding
2022-02-28 17:12:13 -05:00
Tom Lum
dadf7b337f
Merge pull request #6522 from tomlum/email-modal-css-fix
modal css fix
2022-02-28 16:59:10 -05:00
tomlum
cd483d704f Merge branch 'develop' of https://github.com/LLK/scratch-www into scratcher-onboarding 2022-02-23 16:48:03 -05:00
tomlum
6bf5c4dd89 adds tests 2022-02-22 16:03:06 -05:00
BryceLTaylor
e2d1d50a33 Fixes styling of dropdown menu buttons for safari 2022-02-16 16:15:19 -05:00
tomlum
93eeb206af removes unnecessary proptypes 2022-02-16 16:10:49 -05:00
tomlum
4dabdbf01b css fix 2022-02-16 14:52:51 -05:00
tomlum
5ddcdb43cd refactors and changes message url 2022-02-14 17:14:55 -05:00
tomlum
316a19d1d6 fixes dots on navigation bar 2022-02-10 17:26:31 -05:00
tomlum
9255a6168b modal css fix 2022-02-10 17:06:55 -05:00
tomlum
7fd713eb6c refactors and changes invite route 2022-02-10 11:43:58 -05:00
BryceLTaylor
ccedbacb7d Update .scss files to fix deprecated syntax
hsl and hsla now require a % for the saturation and lightness values

division is now handled with the function math.div() rather than a slash

This removes many deprecation warnings
2022-02-09 12:48:13 -05:00
BryceLTaylor
2ebdd767cc replace node-sass with sass (dart-sass)
numbers are not valid class names and the new version of sass errors on it when the old version didn't.

Also, the jsx uses the class mod-2019 and I'm not sure why it worked in the first place.

We will need a followup to fix the deprecation warnings.
2022-02-09 12:08:51 -05:00
tomlum
0e1ebbcf41 refactors and svg minify 2022-02-08 16:43:50 -05:00
webdev03
bf290e27ed
Merge branch 'LLK:develop' into patch-1 2022-02-05 19:59:56 +13:00
tomlum
f2bceb15e0 misc refactors 2022-02-04 16:25:16 -05:00
tomlum
4ed943c52f rename to become-a-scratcher 2022-02-04 15:02:35 -05:00
tomlum
497862d45c Merge remote-tracking branch 'scratch/develop' into scratcher-onboarding 2022-02-04 14:41:40 -05:00
tomlum
3ec8a7fba8 Merge remote-tracking branch 'origin' into scratcher-onboarding 2022-02-04 14:33:54 -05:00
tomlum
b388929865 lint line fix 2022-02-02 16:54:42 -05:00
tomlum
c83d01f843 scratcher onboarding page 2022-02-02 16:22:39 -05:00
Sarah Otts
eacdcdb870
Merge pull request #6471 from zoebentley/ethics-update-jan-2022
Updated text on Code of Ethics page
2022-02-01 11:02:24 -05:00
zoebentley
18a1f5f55f
Update src/views/ethics/l10n.json
Leave email on translated

Co-authored-by: Sarah Otts <se0042@gmail.com>
2022-02-01 10:30:04 -05:00
zoebentley
d55185eb1c
Update src/views/ethics/ethics.jsx
Leave email untranslated

Co-authored-by: Sarah Otts <se0042@gmail.com>
2022-02-01 10:29:35 -05:00
Sarah Otts
1dc4881080
Merge pull request #6446 from mxmou/teacher-registration-label-font-weight
Use font weight bold consistently for teacher registration form labels
2022-01-27 17:11:26 -05:00
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
webdev03
6b4c138c2e
Fix typo in FAQ
There is a topic in Suggestions for this: https://scratch.mit.edu/discuss/topic/560654/
2022-01-25 21:38:20 +13:00
tomlum
024f97ddb2 work on promote 2022-01-24 11:48:15 -05:00
Maximouse
55fa30e904 Use bold instead 2022-01-23 11:23:42 +01:00
Zoë Bentley
1143821dab Updated text on Code of Ethics page 2022-01-21 10:18:26 -05:00
tomlum
cfe63c5b75 confetti and misc refactors 2022-01-20 16:34:58 -05:00
Joel Gritter
0d659b5d18
fix(gh-4969): add missing period to l10n string
Adds missing period to the end of the `comment.unconstructive.header` string.
2022-01-20 06:49:38 -05:00
Karishma Chadha
00f243250c Forward fix for regression introduced by changing the number of replies we fetch. This change updates the number of comment replies we fetch on project comments from 20 to 25 to be consistent with studio page. Also updates the code that controls whether to display the 'See more replies' button on comment threads. 2022-01-12 14:45:20 -05: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
dec4fc7ec4 Left-align project instructions and notes on medium window widths 2022-01-09 16:00:38 +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
Maximouse
c89f93ce60 Focus comment reply textarea when it appears 2022-01-09 11:27:48 +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
Tom Lum
e15741e5f2
Merge pull request #6365 from LLK/unconfirmed-scratcher-project-share
Email Confirmation on Project Page
2022-01-04 17:25:16 -05:00
Karishma Chadha
d737196b2b
Merge pull request #6311 from JoelGritter/patch-1
fix(gh-5989): adjust comment load batch size
2021-12-22 13:25:00 -05:00
Ray Schamp
372681ade1
Merge pull request #6375 from LLK/hotfix/gtm
[Develop] Add configuration for GTM
2021-12-20 09:34:53 -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
seotts
4496e4fa5e Remove modal opening/closing logic from splash page 2021-12-17 13:13:36 -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
6126ffa24c Fix prop-related linted errors 2021-12-17 13:13:36 -05:00
seotts
cf92ecca46 Add missing PropTypes 2021-12-17 13:13:36 -05:00
seotts
6814c8f5b1 Wire up banner dismissal 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
94b7a81863 fixes showEmailConfirmationBanner 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
Sarah Otts
bcdc3125a3
Merge pull request #6368 from hello-smile6/patch-1
Correct link href for studio host transfer message
2021-12-13 07:19:16 -05:00
rschamp
42b88faa3f Add configuration for GTM 2021-12-10 13:49:43 -05:00
Sarah Otts
eebe3e1eb0
Merge pull request #6355 from seotts/privacy-policy-apps
App privacy policy
2021-12-08 10:35:05 -05:00
seotts
abc5ababd4 Correct update date 2021-12-07 15:59:02 -05:00
seotts
8c890d5fd3 Define contact info at top of file; consolodate requires 2021-12-07 13:30:48 -05:00
seotts
4ce5656508 Remove l10n string typos 2021-12-07 13:30:08 -05:00
hello-smile6
bd788182e0
Correct link href for studio host transfer message
Fixes https://github.com/LLK/scratch-www/issues/6367
2021-12-05 12:15:14 -08:00
seotts
5c813a3480 Privacy policy for apps 2021-12-01 14:39:53 -05:00
tomlum
5da297f0de progress on onboarding 2021-11-30 16:09:24 -05:00
zoebentley
8ff2f5bbd4
Update src/views/parents/l10n.json
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-11-30 09:58:47 -05:00
Zoë Bentley
2f9e2905cb updated parents page with information about scratch foundation 2021-11-24 10:38:40 -05:00
Karishma Chadha
0ae445d32f Fix layout of HOC banner on tablets. 2021-11-29 20:48:40 -05:00
Karishma Chadha
1155b17358 Show donate banner while showing HOC banner. Fix donate banner to use 'sticky' positioning. 2021-11-29 20:40:29 -05:00
Karishma Chadha
a6e9c51ad2 Update HOC banner timing and tutorials. 2021-11-22 20:38:00 -05:00
seotts
d7bfa2ed6f Remove 2019 from Annual Report 2019 2021-11-17 16:08:21 -05:00
Joel Gritter
ebb975d948
fix(gh-5989): use separate limit values
- use separate COMMENT_LIMIT and REPLY_LIMIT values
- use 25 as REPLY_LIMIT value
- restore original COMMENT_LIMIT value of 20
2021-11-17 06:50:21 -05:00
Joel Gritter
ac670f7749
fix(gh-5989): adjust comment load batch size
- adjust the studio reply comment load batch size to 25 instead of 20
2021-11-17 06:39:29 -05:00
Karishma Chadha
78688203b1
Merge pull request #6301 from kchadha/annual-report-fixes
[Develop] Annual report fixes
2021-11-16 11:47:36 -05:00
Karishma Chadha
7baa676a5c Update /annual-report route to point to 2020 report. 2021-11-15 17:25:08 -05:00
Sarah Otts
91d0d9be4e Delete commented out line 2021-11-15 17:07:56 -05:00
Sarah Otts
814a31236b Remove commented out code 2021-11-15 17:07:56 -05:00
Karishma Chadha
753b422d25 More layout fixes. 2021-11-15 17:07:56 -05:00
Karishma Chadha
0373dd578e Update copy 2021-11-15 17:07:56 -05:00
Karishma Chadha
0b958cb0f3 Update blurry image of scratch editor. 2021-11-15 17:07:56 -05:00
Karishma Chadha
f864e12da2 Update links to embedded projects. 2021-11-15 17:07:56 -05:00
Karishma Chadha
d09e7628f9 Copy changes for annual report 2021-11-15 17:07:56 -05:00
Karishma Chadha
1d68765c48 More layout, and font-size fixes for annual report. 2021-11-15 17:07:56 -05:00
Karishma Chadha
f427e4a2b0 Update font sizes, pill styling, and country blurb font sizing and layout. 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
Sarah Otts
ca8d9187d3
Merge pull request #6254 from seotts/about-copy-changes
Update About page copy
2021-11-09 09:50:00 -05:00
rschamp
dcc7fa2008 Transform async/await syntax for Safari <= 10 2021-11-08 12:00:56 -05:00
rschamp
735042c414 Revert "Merge pull request #6245 from LLK/revert-6243-hotfix/dynamic-intl-polyfill"
This reverts commit 42712bd636, reversing
changes made to f152df774f.
2021-11-08 11:50:18 -05:00
Sarah Otts
f3d2e69442
Merge pull request #6204 from zoebentley/parents-page-oct-2021
Removed a broken link from the For Parents page
2021-11-03 13:40:17 -04:00
seotts
5607626e64 Update About page copy 2021-11-03 11:32:38 -04:00
Sarah Otts
eeb198bf94
Merge pull request #6179 from tomlum/research-page-copy-change
Copy changes to research page
2021-11-01 16:00:37 -04:00
chrisgarrity
55d2a389e4
Revert "Replace static plural rule and relative time polyfills with a dynamic import" 2021-11-01 13:33:30 -04:00
chrisgarrity
f152df774f
Merge pull request #6243 from LLK/hotfix/dynamic-intl-polyfill
Replace static plural rule and relative time polyfills with a dynamic import
2021-11-01 12:14:37 -04:00
rschamp
a6be8aea1c Fix lint 2021-11-01 11:10:22 -04: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
4bd6b239e2 set max width for tweets on small view -- fixes ios bug 2021-10-29 14:10:53 -07: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
caseymm
c883e0bfd6 remove comment 2021-10-28 10:44:28 -07:00
caseymm
a94ea1b525 changes from bug hunt 2021-10-28 10:42:06 -07:00
Karishma Chadha
8ad89f818d
Merge pull request #6212 from LLK/kchadha-annual-report-routes
Update Annual Report Routes - no redirects
2021-10-27 16:14:24 -04:00
Karishma Chadha
2916d7e4cf
Merge pull request #6206 from bocoup/annual-report-2020
Annual report 2020
2021-10-26 18:18:44 -04:00
Casey Miller
d35b008fe9
Update src/views/annual-report/2020/annual-report.jsx
Co-authored-by: Karishma Chadha <kchadha@scratch.mit.edu>
2021-10-26 15:16:38 -07:00
caseymm
6c1e6458de change max width 2021-10-26 15:02:58 -07:00
Karishma Chadha
1fe931482c
Update Annual Report Routes - no redirects
Update the /annual-report route to just point to the appropriate 2019 (or in the future, 2020) Annual Report instead of redirecting to a different route and updating the redirect.

@rschamp putting this PR up for discussion, we can talk about other alternatives as well.
2021-10-26 17:43:40 -04:00
caseymm
2e1bdd72cb fix spotight margin bug 2021-10-26 10:35:59 -07:00
tomlum
fa3fa3be63 updates string id and ethics link 2021-10-26 13:22:39 -04:00
Zoë Bentley
0bdd7dd8b0 Removed a broken link from the For Parents page 2021-10-25 12:40:05 -04:00
caseymm
3d44e562d3 iframe sizing 2021-10-22 15:25:56 -07:00
caseymm
7c65b5fd73 padding/margin, tweets, other sizing 2021-10-22 14:48:48 -07:00
caseymm
0f12bd2571 start mobile issues 2021-10-22 14:22:36 -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
Sarah Otts
468e4c0a7f
Merge pull request #6163 from seotts/code-of-ethics
Add Code of Ethics page
2021-10-22 16:33:43 -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
seotts
0f86ce4671 Fix ethics page route styling 2021-10-22 15:11:41 -04:00
Sarah Otts
ee562799bf
Merge pull request #6172 from seotts/transferring-typo
Fix "transferring" misspelling
2021-10-22 09:41:09 -04:00
caseymm
f8bdd8948b spinner color and correcting other errors 2021-10-21 16:42:22 -07:00
caseymm
55ea8ea083 aaron text 2021-10-21 16:15:30 -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
ed03927efd padding and other things 2021-10-21 11:21:18 -07:00
Tom Lum
d419e8958b
Update src/views/research/research.jsx
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-10-21 14:20:49 -04:00
caseymm
e9ba8cf238 fix wave 2021-10-21 11:04:53 -07:00
Sarah Otts
d01d66101e
Merge pull request #5669 from apple502j/add-cg-link
Link community guidelines in project.defaultCensoredMessage
2021-10-21 13:50:37 -04:00
caseymm
9f2c4a29cf reconfigure video layout 2021-10-21 10:46:37 -07:00
caseymm
acc8cdab3c fix avatar on juneteenth illo 2021-10-20 15:46:43 -07:00
caseymm
522e2335fa adjust some of the timeline bg images 2021-10-20 15:30:16 -07:00
caseymm
283f7c2630 fix timeline dots 2021-10-20 15:22:53 -07:00
caseymm
c3c04a32e3 add pull quote 2021-10-20 15:00:03 -07:00
caseymm
4d1b3ab184 remove unneeded images 2021-10-20 13:39:22 -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
tomlum
ec10992338 copy changes to research page 2021-10-20 14:19:15 -04:00
caseymm
2016380b34 add alts for india grid 2021-10-20 10:55:24 -07:00
caseymm
ddb1aaec8c update images 2021-10-19 17:40:36 -07:00
caseymm
d3aa437444 styling 2021-10-19 16:27:42 -07:00
caseymm
f09e3e51c4 a bunch of color and linting fixes 2021-10-19 15:58:14 -07:00
caseymm
e12ff6a67a lots of alt text for images in the main page 2021-10-19 14:27:34 -07:00
caseymm
dbd5005cee start alts for images 2021-10-19 12:23:23 -07:00
seotts
1c01842a24 Fix "transferring" misspelling 2021-10-19 10:36:39 -04: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
754510832c fix some avatars 2021-10-18 11:36:31 -07:00
caseymm
af0454a747 clean out some css 2021-10-18 11:08:35 -07:00
caseymm
cb67a918d2 force autoplay on videos 2021-10-18 10:15:32 -07:00
rschamp
5d14efd9a0 Add remaining supported locales to intl-polyfill 2021-10-18 11:38:43 -04: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
498b35a945 fix npm 2021-10-14 18:09:01 -07:00
caseymm
feebe8e486 more content for supporters 2021-10-14 16:43:48 -07:00
caseymm
220266d973 finish community content minus links 2021-10-14 11:24:02 -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
41ada2ce94 community section content 2021-10-13 13:50:21 -07:00
seotts
c25059bb4b Redirect 3faq to /faq, not /info/faq 2021-10-13 15:35:22 -04:00
caseymm
6f1688d399 embed some projects 2021-10-13 10:55:29 -07:00
seotts
df46afbcf5 Add code of ethics page 2021-10-13 13:42:20 -04:00
caseymm
ac467b3cab start community section 2021-10-12 17:38:23 -07:00
caseymm
bd4892da4a get community header in 2021-10-12 15:55:30 -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
2d86753907 more adaptation 2021-10-12 12:01:21 -07:00
Sarah Otts
6418bd95f0
Merge pull request #6057 from itta611/patch-1
Fix padding under grayed out comment compose box on studios after becoming muted
2021-10-12 09:04:01 -04:00
Itta
58dc901e0d
Update src/views/preview/comment/comment.scss
Thanks!

Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-10-09 07:10:11 +09:00
Sarah Otts
e33832f8d7
Merge pull request #5997 from LankyBox01/patch-2
fix #5865
2021-10-07 13:20:36 -04:00
caseymm
352f31698e add aaron 2021-10-05 17:11:53 -07:00
caseymm
d7295ae58a redo one of the quotes 2021-10-05 16:53:30 -07:00
caseymm
a45c1b6700 finish content in connectivity section 2021-10-05 15:27:11 -07:00
caseymm
950c608217 create 2019 folder 2021-10-05 13:18:19 -07:00
caseymm
4dbe0d20f0 country sections 2021-10-05 11:52:50 -07:00
caseymm
1b84e3417b world and video 2021-10-04 15:48:39 -07:00
caseymm
537704cf89 india css 2021-10-04 14:10:15 -07:00
caseymm
8c39865c4f starting scratch in india 2021-10-01 15:47:10 -07:00
caseymm
8f73470276 themes blobs 2021-10-01 14:28:24 -07:00
caseymm
b3b3ab4126 more arrows and formatting 2021-09-30 16:52:40 -07:00
caseymm
03a2435863 style changes for top two sections 2021-09-30 16:23:15 -07:00
caseymm
9c83891a42 added assets folder and started swapping in assets 2021-09-30 11:17:15 -07:00
caseymm
da116acda0 a bit more 2021-09-29 17:17:34 -07:00
caseymm
2263ec4974 more content changes 2021-09-29 17:04:29 -07:00
caseymm
4277aa5db0 some content changes 2021-09-29 15:54:33 -07:00
seotts
1d4c7e8938 show "Studio Host" on manager tile 2021-09-29 16:00:52 -04:00
caseymm
743ccb0428 start to swap out nav 2021-09-28 16:41:30 -07:00
caseymm
845d7ed578 route and 2020 folder 2021-09-28 15:49:09 -07:00
seotts
ef3e861fc3 Allow admins to promote curators 2021-09-24 16:12:09 -04:00
Sarah Otts
705e8dba6e
Merge pull request #6085 from zoebentley/credits-page-update-9-21
Credits page update 9 21
2021-09-24 11:08:01 -04:00
Zoë Bentley
d2c3cce09b Added Harakou 2021-09-24 10:39:51 -04:00
Sarah Otts
1ee64bf4d9
Merge branch 'develop' into remove-studio-feature-flag 2021-09-21 10:43:07 -04:00
Zoë Bentley
b078ec23bf Added 1 more person 2021-09-21 10:41:56 -04:00
seotts
80a99bc0b6 Remove use of studio transfer feature flag
Remove another use
2021-09-21 10:40:18 -04:00
Sarah Otts
be0144618d
Merge pull request #6078 from seotts/use-host-in-api-response
Use studio "host" in state, and accept "host" from api
2021-09-21 10:10:59 -04:00
Zoë Bentley
e21208a196 Added 1 person who joined since last time I edited branch 2021-09-20 15:38:58 -04:00
Zoë Bentley
599cc12bd4 Updated team members on credits page september 21 2021-09-20 15:11:51 -04: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
seotts
3ef41d2790 Remove use of new studios feature flag 2021-09-20 13:40:37 -04:00
seotts
2b1dfcda62 Fix a couple of comments 2021-09-20 12:09:47 -04:00
seotts
c70b67cde5 If studio response body has no host yet, use owner 2021-09-20 11:31:36 -04:00
seotts
dc241e1c6f Accept studio "host" from api; use "host" in state 2021-09-17 15:50:16 -04:00
Ray Schamp
0a4bacd1d0
Merge pull request #6062 from rschamp/allow-querystrings
Make /educators routes robust to querystrings
2021-09-15 13:35:49 -04:00
rschamp
6a289fe6de Make /educators routes robust to querystrings 2021-09-15 11:09:45 -04:00
seotts
92bad5b505 Change copy of rate-limit error 2021-09-14 16:16:30 -04:00
Itta
dcadc47e6e
fix #5890 2021-09-14 06:55:56 +09:00
seotts
b692b61812 Change default validation error 2021-09-07 14:08:25 -04:00
seotts
5d8d2a05c8 Add transfer error for too many password attempts 2021-09-07 12:24:02 -04:00
Sarah Otts
f21c91106e
Merge pull request #6022 from zoebentley/bengali-language-organizer
Added Nasir and reordered lang organizers alphabetically by first name
2021-09-03 14:12:38 -04:00
Eric Rosenbaum
466b6dfc2e
Merge pull request #5992 from ericrosenbaum/transfer-modal6
More transfer host modal fixes
2021-09-02 14:50:17 -04:00
Eric Rosenbaum
1d6c47d2a4
Revert "Revert "Transfer host modal updates"" 2021-09-02 14:43:31 -04:00
Zoë Bentley
a49308c5f3 Added Nasir and reordered lang organizers alphabetically by first name 2021-09-02 11:48:28 -04:00
Eric Rosenbaum
ad2536e2c6
Revert "Transfer host modal updates" 2021-09-01 10:08:11 -04:00
Eric Rosenbaum
bb428a308d put arrow fn wrapper for loadManagers into connect 2021-08-31 17:12:53 -04:00
Eric Rosenbaum
0d670b1087 Fix load more buttons 2021-08-30 15:50:04 -04:00
LankyBox01
6ffd1dbc66
fix #5865
yup
2021-08-28 22:36:32 +03:00
Eric Rosenbaum
5356f05d38 reject on error 2021-08-27 14:02:25 -04:00
Eric Rosenbaum
08b5383370 responsive style for transfer outcome tiles 2021-08-27 11:22:49 -04:00
Eric Rosenbaum
b1239e72fc
Merge pull request #5988 from ericrosenbaum/transfer-modal5
Transfer host modal updates
2021-08-27 11:05:17 -04:00
Eric Rosenbaum
5aa1b8c8e7 Store host info in state so the modal doesn't update after reloading managers 2021-08-27 10:20:37 -04:00
Eric Rosenbaum
a6b7ef3c4b reload managers before closing modal 2021-08-26 19:49:46 -04:00
Eric Rosenbaum
65eddfe420 responsive style for password validation 2021-08-26 17:32:51 -04:00
Eric Rosenbaum
ad85a3d525 handle password error 2021-08-26 14:12:53 -04:00
Eric Rosenbaum
ffe1475401 Reload the managers list after transfer 2021-08-26 13:32:34 -04:00
Karishma Chadha
1991070a4d
Merge pull request #5980 from kchadha/host-transfer-message
Add new host transfer notification message.
2021-08-26 10:06:14 -04:00
Chris Garrity
cb968f3842 [WIP] preliminary intl polyfill
partial implementation of intl-polyfill. Doesn't include all the www langauges, and we don't want to have to update www each time there is a language added, so this needs to move into scratch-l10n somehow.

polyfill.min.js no longer needs the intl.js polyfill, so removed. Should still look at whether the other parts of polyfill.min are needed, but they're unrelated to intl.
2021-08-25 11:13:24 -04:00
Karishma Chadha
c3f7494b8d Add new host transfer notification message. 2021-08-25 01:21:41 -04:00
Eric Rosenbaum
13e3a540f7 cursor pointer on member tile when selecting 2021-08-24 17:18:05 -04:00
Eric Rosenbaum
198ae5823d prevent layout change due to validation alert 2021-08-24 15:21:33 -04:00
Eric Rosenbaum
95e43cabd2 "Studio Host" label on curator tab tile, behind feature flag 2021-08-24 15:05:00 -04:00
Eric Rosenbaum
6834d675b1 disable confirm button while submitting 2021-08-24 14:52:11 -04:00
Eric Rosenbaum
5d838ef659 Muted users cannot transfer studio host 2021-08-24 14:36:06 -04:00
Eric Rosenbaum
aecc9cec6e disable confirm button if there is a password validation error 2021-08-24 10:42:28 -04:00
Eric Rosenbaum
7f4ef784c2
Merge pull request #5959 from ericrosenbaum/transfer-modal3
Studio host transfer modal additional work
2021-08-24 10:40:53 -04:00
Eric Rosenbaum
7810ba2d3e update error code id 2021-08-22 15:28:32 -04:00
Eric Rosenbaum
a8b7961f66 alerts default to 6 seconds 2021-08-20 14:04:09 -04:00
Eric Rosenbaum
b00a2d34f7 Merge branch 'develop' of https://github.com/LLK/scratch-www into transfer-modal3 2021-08-20 13:02:08 -04:00
Sarah Otts
3ae87754a0
Merge pull request #5760 from LankyBox01/patch-1
Add line breaks to description
2021-08-20 11:07:27 -04:00
Eric Rosenbaum
76ec4c90d8 More error handling, moved to confirmation step 2021-08-19 18:05:18 -04:00
Eric Rosenbaum
a305a0963d send password in body of request 2021-08-19 14:54:58 -04:00
Eric Rosenbaum
296506ff84
Merge pull request #5920 from ericrosenbaum/transfer-modal
Studio host transfer modal (work in progress)
2021-08-19 14:04:35 -04:00