Commit graph

3822 commits

Author SHA1 Message Date
Karishma Chadha
4728e3f50e
Merge pull request #4615 from kchadha/annual-report-link
Add link to annual report from about page
2020-11-16 10:15:02 -05:00
picklesrus
0470e0e56b Convert timestamp to always show in minutes.
This is minor step towards correct time formatting. More coming later.
2020-11-13 15:03:49 -05:00
picklesrus
bfc4202d11 Use singular units so the library handles plurals. 2020-11-13 14:14:42 -05:00
Benjamin Wheeler
79d3d07dcc
Merge pull request #4284 from doc-han/patch-1
update translation URL
2020-11-13 14:13:16 -05:00
Ben Wheeler
f2111eb5a3 updated number of languages 2020-11-13 14:11:25 -05:00
picklesrus
13369c3809 add spaces 2020-11-13 08:37:18 -05:00
picklesrus
6eb7504442 Initial time formatting pass. Does integer minutes, hours, days.
TODOS:
- set langauge appropriately
- do partial hours and days. e.g. 1 hour 5 minutes instead of just 1
hour.

Add a time formatting utility that formats a relative time in the future.
Use it in the mute modal & comment box.
2020-11-13 08:26:54 -05:00
Ben Wheeler
ccf0e92e98 removed communityblocks-interviews from routeAlias entries 2020-11-12 13:43:33 -05:00
Radman Siddiki
89c5ea324b Remove Community Blocks Interviews Route 2020-11-12 13:43:33 -05:00
Radman Siddiki
b74d857ad9 Delete communityblocks-interviews.jsx 2020-11-12 13:43:33 -05:00
Karishma Chadha
e14b6d52f3 Add spinner while video is still loading 2020-11-10 14:37:18 -05:00
picklesrus
2005b23777
Merge pull request #4616 from picklesrus/mute-behavior
Skeleton of code to show mute modal and comment status.
2020-11-10 10:24:04 -05:00
picklesrus
b8b0f5d10c
Merge pull request #4580 from picklesrus/modal-image-updates
A few small upates to the muting modal
2020-11-10 09:52:41 -05:00
Karishma Chadha
f89d1313e0 Break out supporters lists into json file and dynamically create lists of supporters. 2020-11-09 11:37:31 -05:00
picklesrus
e5f97d1f18 Skeleton of code to show mute modal and comment status.
Still todo:
- l10n
- Time needs formatting
- Compose box needs to be shown/formatted correctly based on mute status
- Blue comment status box need to be sticky
2020-11-09 11:01:42 -05:00
Karishma Chadha
c3accb0111 Add link to annual report from about page 2020-11-09 10:20:11 -05:00
Benjamin Wheeler
69efc1afea
Merge pull request #4287 from R4356th/patch-11
Replace "Tips Page" with "Ideas Page"
2020-11-05 09:41:48 -05:00
picklesrus
495edd1820 A few small upates:
- Add images and update styles to match.  
- Add timeMuted prop so it can display how long the user is muted for. 
- Text updates

This still needs localization.
2020-10-30 10:07:43 -04:00
Karishma Chadha
4369899813 Fix BLM studio link 2020-10-29 09:43:10 -04:00
Karishma Chadha
4f6828bde8 Update board member section 2020-10-28 18:31:10 -04:00
seotts
b3cdc0ebcd fix Mahmoud’s image 2020-10-28 18:17:07 -04:00
seotts
729739c222 fix typo in project title 2020-10-28 18:04:51 -04:00
Karishma Chadha
412de9dbda Fix typos in content 2020-10-28 17:08:36 -04:00
Karishma Chadha
8d722d454f Update l10n to remove unused strings from financials section 2020-10-28 13:06:44 -04:00
seotts
367ada3452 remove middle of financials section 2020-10-28 12:57:20 -04:00
Karishma Chadha
b673d718d4 Minor content update 2020-10-28 10:34:41 -04:00
Karishma Chadha
9a5560bdf5 Don't show scratch-jr-transition images on small screens. Fix lint issue. 2020-10-27 16:43:21 -04:00
seotts
a8058aa0bf remove comments; add new lines 2020-10-27 15:29:50 -04:00
seotts
5e075a2feb make financials button responsive 2020-10-27 14:23:34 -04:00
seotts
23736463f8 make map key even more responsive 2020-10-27 14:16:42 -04:00
seotts
f88fd8279a make map key responsive 2020-10-27 13:55:10 -04:00
Karishma Chadha
73cf337ac2 Map title update 2020-10-27 12:55:16 -04:00
Karishma Chadha
5771444811 Some content/copy changes. 2020-10-27 12:26:25 -04:00
seotts
90650ff5d8 fix community guidelines bullet points 2020-10-27 12:12:59 -04:00
carljbowman
2db15df51e Tweaks to the map container
- Ajust border radius
- Remove bottom padding to make the map flush with the bottom, which required adding `overflow: hidden` to maintain the bottom border radius.
2020-10-27 11:51:27 -04:00
seotts
ae16b8638b un-yoda-fy some country names (eg “Korea, Rep..”) 2020-10-27 11:49:00 -04:00
seotts
96b2627dd0 remove outline on blm project tiles 2020-10-27 11:36:25 -04:00
carljbowman
a028512aa3 Fix overlapping text in Financials key section 2020-10-27 11:27:26 -04:00
carljbowman
d05486d4d1 Adjust layout / spacing of BLM story 2020-10-27 11:19:53 -04:00
carljbowman
3f57ccecfa Tweak rules and spacing on donor lists 2020-10-27 11:17:55 -04:00
carljbowman
c08230aa45 Fix fallback fonts for buttons
Removed the narrowly scoped font-family definition on the button elements. Now buttons inherit the site wide font-family specification, which include the appropriate fallbacks.
2020-10-27 11:03:32 -04:00
carljbowman
29d03282d4 Fix Tutorial stats layout 2020-10-27 10:46:26 -04:00
carljbowman
dbae2cbe66 Fix layout issues with CPS grid of 4 photos
- Reorder images so supporting illustrations do not overlap important photographic content
- Tweaked Pizza and Pencils positioning to adjust layout
2020-10-27 10:30:47 -04:00
carljbowman
e2894dd18d Fix photo credit typographic styles 2020-10-27 10:13:54 -04:00
Karishma Chadha
b689702930 Leadership renamed to Team in subnav. Update content in Supporters and Team sections. Fix board member company attribution. Update Mitch's name in people grid. 2020-10-27 02:08:05 -04:00
Karishma Chadha
e2db5fd562 Minor content update for initiatives description 2020-10-27 01:28:05 -04:00
Karishma Chadha
615aa812c5 Update content/copy from Initiatives - Community through Financials section. Add missing link in Initiatives - Schools section. Add new financials note. Fix financials percentages. Clean up some commented out code from scss file. 2020-10-27 01:26:15 -04:00
Karishma Chadha
da1e8c00c5 Update translation image in reach section. Fix remaining world map prop type warning. 2020-10-27 01:20:04 -04:00
Karishma Chadha
a8c7919f5f Add Initiatives description. 2020-10-26 22:36:02 -04:00
Karishma Chadha
f284200997 Fix 'languages' typo 2020-10-26 18:46:37 -04:00
Karishma Chadha
5fc610ac87 Update content strings through Initiatives - Creative Tools. Also includes fixes for supporter levels where they were missing a 0. Added the new initiatives description blurb to l10n.json, though it's not yet referenced in the html. 2020-10-26 18:40:51 -04:00
seotts
9956ded2ad fix conferences spaces, mobile 2020-10-26 17:51:33 -04:00
seotts
f0951af780 fixed abhi section at intermediate size 2020-10-26 17:45:37 -04:00
seotts
d68691de40 add map key 2020-10-26 17:36:23 -04:00
carljbowman
020e9029e9 Fix relatively sized line-height on paragraph styles
Paragraphs with larger font sizes will now have proportionally sized line-heights based on the font size.
2020-10-26 15:11:32 -04:00
Karishma Chadha
14397625db Move transition messages from milestones section into reach section. Fix ScratchJr transition messages based on changes made with the milestone-reach transition images. Fix lint issue. 2020-10-26 01:27:00 -04:00
Karishma Chadha
3546be1b12 Make data point numbers in Reach section bold. Make spacing more consistent in mission section of the scss file. 2020-10-25 23:39:24 -04:00
Karishma Chadha
240fd5e53b Make 4Ps more consistent with design sketch for all screen sizes. 2020-10-25 23:10:11 -04:00
Karishma Chadha
8cf04fe705 Fix incorrect scroll position behavior on Safari by switching to use window.scrollTo. Rename Donate section title to Support Us 2020-10-23 18:48:53 -04:00
seotts
c0fb4970e2 open donate link in new tab 2020-10-23 16:57:53 -04:00
seotts
83263631df Fix page title (in tab) 2020-10-23 16:51:46 -04:00
seotts
29a81b08c1 fit community guidelines into 2 cols 2020-10-23 16:48:12 -04:00
seotts
497ba5c6f3 fix tutorials spacing and size 2020-10-23 16:45:17 -04:00
seotts
544df10aae content updates 2020-10-23 11:57:37 -04:00
seotts
c460b4fbad update financials copy 2020-10-23 09:23:35 -04:00
Karishma Chadha
c6b967a688 Fix 4ps being out of order on smaller screens, fix responsiveness issues, initiatives tools hero images now scale along with page width. Fix #view width at 100% like some other pages do. 2020-10-23 00:17:58 -04:00
Karishma Chadha
99d8997035 Update content for message, covid response, and mission 2020-10-22 22:23:28 -04:00
Karishma Chadha
7904c7c1ca Fix font size on conferences photo credits and remove LLK from photo credits 2020-10-22 18:38:38 -04:00
Karishma Chadha
c10a805197 Add updated blocks images for reach section, clean up images folder (creating financials and reach subfolders) 2020-10-22 17:39:22 -04:00
seotts
9a0ce3db48 make equity and global strategies taller 2020-10-22 16:01:18 -04:00
rschamp
c3514aeb4c Finishing touches on responsive map 2020-10-22 15:47:21 -04:00
rschamp
59f0f2c093 Make the map always 100% width with 2:1 aspect ratio 2020-10-22 15:20:31 -04:00
carljbowman
964204c77f Update paragraph size for one-p
Change the size of the description with four p’s.
2020-10-22 15:10:35 -04:00
seotts
96fc42c496 formatting extensions statistics 2020-10-22 15:09:38 -04:00
seotts
d9415d6fe4 reduce space between paragraphs 2020-10-22 15:01:47 -04:00
seotts
3329a58da2 fix size of missions illustrations 2020-10-22 14:54:52 -04:00
seotts
9182ab9421 fix sizes of tools hero images 2020-10-22 14:44:35 -04:00
Karishma Chadha
df27950a31 Remove mapHeight and mapWidth prop validation since they're no longer in use 2020-10-22 12:20:26 -04:00
Karishma Chadha
aa25ee9d38 Add final team photo and updated blocks image, fix some responsiveness issues 2020-10-22 11:50:49 -04:00
seotts
3ccd72efec schools section respnsiveness 2020-10-22 11:50:48 -04:00
Karishma Chadha
44a5394667 More responsiveness updates and replace placeholder image for donate section 2020-10-22 11:50:48 -04:00
rschamp
67ff392776 Start on responsive map 2020-10-22 11:50:48 -04:00
Karishma Chadha
d1285b91ee Some more responsiveness fixes for intermediate size 2020-10-22 11:50:48 -04:00
rschamp
ed29a391fc Update translate intro with more context 2020-10-22 11:50:48 -04:00
seotts
dea1362697 make small scratch team grid have two columns 2020-10-22 11:50:48 -04:00
seotts
b931cf9645 fix cut-off bullet points 2020-10-22 11:50:48 -04:00
seotts
67d4090377 add wistia version of cps video 2020-10-22 11:50:48 -04:00
seotts
551eea91b5 Revert "Add CPS video"
This reverts commit ec97646bf7430e874b0045a61a5f9d39d4c862de.
2020-10-22 11:50:48 -04:00
seotts
be49e209bb Revert "Add ability to display YouTube in addition to Wistia"
This reverts commit 8d758f0420b967aa5d3f9e9c14b9f9201c2702a6.
2020-10-22 11:50:48 -04:00
seotts
dd1fa88889 scratchjr transition images 2020-10-22 11:50:48 -04:00
Karishma Chadha
8cec16ca9f Fix 4-column (mobile) responsiveness for creative tools section 2020-10-22 11:50:48 -04:00
Karishma Chadha
8c8052c052 Fix 4-column (mobile) responsiveness of schools and community sub-sections 2020-10-22 11:50:48 -04:00
Karishma Chadha
64bdc9eb29 Fix lint errors 2020-10-22 11:50:48 -04:00
seotts
ff6a3eb30f Add CPS video 2020-10-22 11:50:48 -04:00
seotts
79bc95a4c6 Add ability to display YouTube in addition to Wistia 2020-10-22 11:50:48 -04:00
seotts
5e1739f7c5 add leadership content 2020-10-22 11:50:48 -04:00
seotts
79b538dee3 add correct hrefs to links, and open in new tabs 2020-10-22 11:50:48 -04:00
seotts
c08650f2b7 add abhi video and fix thumbnail hover 2020-10-22 11:50:48 -04:00
seotts
e10898a765 Add BLM video 2020-10-22 11:50:48 -04:00
Karishma Chadha
84151dd298 Schools subsection of Initiatives, not fully responsive yet 2020-10-22 11:50:47 -04:00
seotts
0770941845 add padding to top of our team 2020-10-22 11:50:46 -04:00
seotts
88dfdc32ce localizable pillars 2020-10-22 11:50:46 -04:00
seotts
2f119961ec work on making reach and tools responsive 2020-10-22 11:50:46 -04:00
seotts
ce6442b337 update content in reach section 2020-10-22 11:50:46 -04:00
seotts
f83df24519 add pillars graphics 2020-10-22 11:50:46 -04:00
rschamp
d113dda808 Mission section - rough in some responsiveness 2020-10-22 11:50:46 -04:00
Karishma Chadha
ece76e090a Remove transition images between milestones and reach from views that are smaller than desktop width 2020-10-22 11:50:46 -04:00
seotts
4513fd8503 finish tools mobile intermediate 2020-10-22 11:50:46 -04:00
Karishma Chadha
6c7096c314 Link to audited financials pdf in the financials section 2020-10-22 11:50:46 -04:00
seotts
fc7b58364b finished tools for tablet 2020-10-22 11:50:46 -04:00
seotts
a7a943dff5 finish tools section for desktop 2020-10-22 11:50:46 -04:00
rschamp
51637c250d Fix mission subheading style 2020-10-22 11:50:46 -04:00
seotts
6360149c96 progress on tools section 2020-10-22 11:50:46 -04:00
seotts
35f20e15f5 tools hero images 2020-10-22 11:50:46 -04:00
rschamp
d6a685d47f Mission l10n 2020-10-22 11:50:46 -04:00
rschamp
c51d7d55a5 Mission section non-responsive non-localized 2020-10-22 11:50:46 -04:00
seotts
eb6bbb2c96 fix abhi’s name 2020-10-22 11:50:46 -04:00
seotts
78c871541c start on tools section 2020-10-22 11:50:46 -04:00
seotts
17b658316b fix video sizing 2020-10-22 11:50:45 -04:00
seotts
cc67b79f00 work on community responsive 2020-10-22 11:50:45 -04:00
rschamp
261313091d More lint 2020-10-22 11:50:45 -04:00
seotts
a558c23f8c lint fix 2020-10-22 11:50:45 -04:00
seotts
1648ad25d8 continued work on initiatives 2020-10-22 11:50:45 -04:00
seotts
aea79a7e58 continued work on initiatives section 2020-10-22 11:50:45 -04:00
seotts
438c5ec0b5 create and use video-preview component 2020-10-22 11:50:45 -04:00
seotts
51904492e9 work on blm section 2020-10-22 11:50:45 -04:00
seotts
04b76feea1 work on map responsiveness 2020-10-22 11:50:45 -04:00
seotts
971f19b352 continued work on community section 2020-10-22 11:50:45 -04:00
seotts
712004ff02 work on initiatives section 2020-10-22 11:50:45 -04:00
seotts
c61953e94a remove reference to deleted css file 2020-10-22 11:50:45 -04:00
Sarah Otts
cf4fbfd98f add newline 2020-10-22 11:50:45 -04:00
seotts
9434bf67f6 remove unused code 2020-10-22 11:50:45 -04:00
seotts
c1754b33cc switch to color variables in css 2020-10-22 11:50:45 -04:00
Karishma Chadha
d3e3171efa Clean up annual report jsx file, add comments for functions and constants 2020-10-22 11:50:45 -04:00
seotts
7b48b50fc1 remove extra css 2020-10-22 11:50:45 -04:00
seotts
9ef0216c28 Made some country names less Yoda-esque 2020-10-22 11:50:45 -04:00
seotts
ed64a1267a update map data 2020-10-22 11:50:45 -04:00
Karishma Chadha
064877bf82 Fix lint errors by commenting out empty divs 2020-10-22 11:50:44 -04:00
Karishma Chadha
c4d8d443f1 Make world map sizing a little bit bigger and give some control over this to whatever uses the component. Fix styling for transition images between the milestones and reach sections (e.g paint brush) 2020-10-22 11:50:44 -04:00
seotts
50672aec9e add read content, translation subsection 2020-10-22 11:50:44 -04:00
Karishma Chadha
1558178318 Remove map view from experimentation phase, clean up world map component (getting rid of lint errors) 2020-10-22 11:50:44 -04:00
seotts
4301446af8 continued work on reach section 2020-10-22 11:50:44 -04:00
seotts
6624dfcfa9 finalize leadership section 2020-10-22 11:50:44 -04:00
seotts
d53a8f71c2 reorder donors, finalize supporters section 2020-10-22 11:50:44 -04:00
seotts
dc5461ef55 continued work on reach section 2020-10-22 11:50:44 -04:00
seotts
5ff0e3468b work on reach section 2020-10-22 11:50:44 -04:00
Karishma Chadha
8b1c008ee2 Added covid response section and fixed responsiveness of message section 2020-10-22 11:50:44 -04:00
seotts
34440308eb work on leadership section 2020-10-22 11:50:44 -04:00
Karishma Chadha
1b574cc2ab Changing subnav to fixed position, removing remnants of the ideas page, more updates to the message section 2020-10-22 11:50:44 -04:00
Karishma Chadha
a1b77639de Beginnings of message section and fixing some subnav behavior 2020-10-22 11:50:44 -04:00
seotts
39ec707cb7 finishing up (?) supporters responsiveness 2020-10-22 11:50:44 -04:00
seotts
90a10bb72e work on supporters responsiveness 2020-10-22 11:50:44 -04:00
Karishma Chadha
fbea2ad525 Finishing up financials section (except for link to PDF) 2020-10-22 11:50:44 -04:00
Karishma Chadha
cbab000486 Finalizing donate and milestones sections 2020-10-22 11:50:44 -04:00
seotts
2ca47dffae supporters content 2020-10-22 11:50:44 -04:00
seotts
6617db7c8b progress on milestones section 2020-10-22 11:50:44 -04:00
seotts
b00110c025 match financial styling to sketch 2020-10-22 11:50:44 -04:00
seotts
6602c93269 finalize financials styling for 12col 2020-10-22 11:50:44 -04:00
Karishma Chadha
61e28278a0 Finish off subnav and more work on financials and donate sections 2020-10-22 11:50:44 -04:00
Karishma Chadha
30eedda2a2 Responsive subnav 2020-10-22 11:50:44 -04:00
Karishma Chadha
2e59359d28 More work on the subnav scroll to section behavior 2020-10-22 11:50:44 -04:00
seotts
17cb454036 work on menu highlighing (not working yet) 2020-10-22 11:50:44 -04:00
seotts
ff24f74fca continued work on supporters section 2020-10-22 11:50:44 -04:00
seotts
10baf9f7ff switch financials section to rem 2020-10-22 11:50:44 -04:00
Karishma Chadha
969544da7f Initial work on milestones section - WIP - needs cleanup 2020-10-22 11:50:44 -04:00
seotts
a70dbce670 progress on supporters styling 2020-10-22 11:50:44 -04:00
seotts
ae3bb5b759 beginning of supporters section 2020-10-22 11:50:43 -04:00
seotts
bc0097cb4a addition of download icon (alignment incorrect) 2020-10-22 11:50:43 -04:00
seotts
4d4f9e720e nearly complete financials section 2020-10-22 11:50:43 -04:00
Karishma Chadha
79d0bef2a0 Beginning work on financials section 2020-10-22 11:50:43 -04:00
seotts
32686c8896 more progress on responsive subnavbar 2020-10-22 11:50:43 -04:00
seotts
8838687b96 initial work on subnav responsiveness 2020-10-22 11:50:43 -04:00
seotts
17224c6d37 more progress on subnav 2020-10-22 11:50:43 -04:00
seotts
9812e959d3 work on subnav 2020-10-22 11:50:43 -04:00
Karishma Chadha
98a7841a50 More progress on donate section 2020-10-22 11:50:43 -04:00
seotts
b6dc0365ee continued work on donate section 2020-10-22 11:50:43 -04:00
seotts
ba8e4705b5 add beginning of a sub-navigation bar 2020-10-22 11:50:43 -04:00
seotts
a4ea33288d route for annual-report 2020-10-22 11:50:43 -04:00
Karishma Chadha
6bd8aea7b7 Add support for a world map component, and an example page that displays it. 2020-10-22 11:50:43 -04:00
seotts
6d2508041f add padding on top of people grid on credits page 2020-10-22 09:18:29 -04:00
GrahamSH
5a7cb21ea5
Add "FloralSunset" to Credits Page 2020-10-21 15:03:13 -04:00
GrahamSH
b9a81559d1
Merge pull request #1 from LLK/develop
Merge
2020-10-21 14:59:08 -04:00
Purple-Hacker
4aa1bd1c25
Update dmca.jsx 2020-10-16 12:28:08 +01:00
Benjamin Wheeler
aa8ac45ec8
Merge pull request #4475 from JeffaloBob/patch-2
replace http links with https links on the 1.4 download page
2020-10-15 14:15:58 -04:00
Benjamin Wheeler
cda05817f9
Merge pull request #4473 from mxmou/fix-load-more-scrolling
Fix "Load more" scrolling
2020-10-15 14:04:07 -04:00
Benjamin Wheeler
11ad1aeac1
Merge pull request #4474 from JeffaloBob/patch-1
add missing space to teacher request form
2020-10-15 13:29:23 -04:00
Sarah Otts
7323ef06bd
Merge pull request #4477 from LLK/people-grid-component
Pull out the credit page's grid of people into a separate component
2020-10-13 11:26:24 -04:00
Benjamin Wheeler
8882840451
Merge pull request #4318 from Nambaseking01/patch-1
Minor grammar fix in FAQ
2020-10-13 11:02:08 -04:00
picklesrus
a567a593fe
Merge pull request #4495 from picklesrus/comment-status
Commenting status component.
2020-10-13 09:03:41 -04:00
picklesrus
966df020f2
Merge pull request #4482 from picklesrus/m-modal-draft
Initial skeleton of mute modal.
2020-10-13 09:02:47 -04:00
picklesrus
0e6e49759c Commenting status component. 2020-10-08 15:12:09 -04:00
Chris Willis-Ford
5f6315e6a1
Merge pull request #4263 from LLK/hotfix/rename-scratch-desktop-to-scratch
[Develop] finish renaming 'Scratch Desktop' to 'Scratch'
2020-10-05 10:29:45 -07:00
picklesrus
405ee52e50 First draft of the mute modal. 2020-10-02 15:59:33 -04:00
seotts
faf5a127d6 remove people grid padding 2020-10-02 15:43:22 -04:00
Karishma Chadha
e2da0b5250 Fix lint issues in people grid component 2020-10-02 15:43:22 -04:00
seotts
b7b3123217 add newline at end of file for linting 2020-10-02 15:43:22 -04:00
seotts
23f6ce281c remove duplicated css from credits page 2020-10-02 15:43:22 -04:00
seotts
204c532c4e connect PeopleGrid to css 2020-10-02 15:43:22 -04:00
seotts
74d18822e6 Make PeopleGrid component 2020-10-02 15:43:22 -04:00
Jeffalo
487c3f3dcd
the ubuntu one doesn't actually have http 2020-10-02 11:36:53 +02:00