Commit graph

14481 commits

Author SHA1 Message Date
Matthew Taylor
e77e02d5a6 Update ttt content
Still missing `FashionGuide`, may need to remove that guide.
2016-11-18 17:42:09 -05:00
Matthew Taylor
b7bfaec438 Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
Fix gh-979: TTT page
2016-11-18 17:41:58 -05:00
Matthew Taylor
e6de0d0ba4 Merge pull request #1018 from mewtaylor/issue/gh-995
Fix GH-995: Make cards tweaks
2016-11-18 17:41:49 -05:00
Matthew Taylor
9ca54e83ce Merge pull request #1008 from mewtaylor/issue/gh-980
Implement GH-980: add new TTT modal component
2016-11-18 17:41:26 -05:00
chrisgarrity
481d89e2fc Merge pull request #1037 from chrisgarrity/patch-column-count
fix column count for IE and Edge
2016-11-18 17:23:29 -05:00
chrisgarrity
0ab62689ce fix column count for IE and Edge
Set column-count for all widths since it’s needed for Firefox, IE and Edge browsers
2016-11-18 17:08:23 -05:00
chrisgarrity
8836d4faff update ttt content
Replace broken Hide-and-Seek-Guide.pdf
Add missing CatchGuide.pdf
2016-11-16 17:02:52 -05:00
The_Grits
f22b698bb6 Bitly URL 2016-11-16 15:24:20 -05:00
The_Grits
62c6a57ff5 Update Trust and Safety Manager URL
I have a feeling Travis won't like this
2016-11-16 14:58:58 -05:00
The_Grits
e1f58662d0 Add localization strings
For #1023
2016-11-16 14:23:16 -05:00
The_Grits
015cca13f4 Localize Explore Title and Dropdown
As per #1023
2016-11-16 14:20:43 -05:00
Matthew Taylor
c4f42b3673 Add hoc banner 2016-11-16 08:52:18 -05:00
Matthew Taylor
e65ba61e7a Move padding to splash element
Having it in the nav was causing issues with positioning the banner, as evidenced by the teacher banner’s `-20px` setting
2016-11-16 08:51:57 -05:00
Matthew Taylor
fe70dd0f9e trello-ize title banner h1,p styling
we need it to be different for the hoc banner, so make it need a class name in order to be styled correctly
2016-11-16 08:50:00 -05:00
Matthew Taylor
e4231e9d57 Update ttt content
Still missing `FashionGuide`, may need to remove that guide.
2016-11-15 07:42:36 -05:00
Matthew Taylor
ac46cce989 Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
Fix gh-979: TTT page
2016-11-15 07:22:16 -05:00
Matthew Taylor
faa8c879be Merge pull request #1018 from mewtaylor/issue/gh-995
Fix GH-995: Make cards tweaks
2016-11-15 07:21:37 -05:00
chrisgarrity
9693a5a526 Merge pull request #999 from TheGrits/patch-4
Fix gh-996: Update Privacy Policy
2016-11-14 16:59:37 -05:00
chrisgarrity
de9fb22fc8 last tweak
use .map (.., key) instead of tile.title just in case we ever have two tiles with the same title.
2016-11-14 16:42:06 -05:00
chrisgarrity
a27fea51e6 Integrated ttt-modal
integrated modal and added guide pdfs.
Catch and Pet Guides are still missing. We may need to remove them from the TTT list. Wanted to get this committed in any case to start review.
2016-11-14 14:34:45 -05:00
Matthew Taylor
370164c585 Make cards tweaks
Fixes #995
2016-11-14 13:35:13 -05:00
chrisgarrity
986a368d2b Remove Story and Fashion TTTs
Create a Story and Fashion Game are not ready, so removing from the ttt json. Leaving in the l10n files so that translations can get started.
2016-11-14 10:37:19 -05:00
chrisgarrity
5854e9ccc9 Adding data for tutorials/guides/cards 2016-11-14 10:31:40 -05:00
Matthew Taylor
1b95e643a9 fix for linting 2016-11-14 10:31:40 -05:00
Matthew Taylor
d72a605e69 Last tweaks
thanks @rschamp!
2016-11-14 10:31:40 -05:00
Matthew Taylor
688ab935d1 Some last tweaks
based on feedback from @rschamp, thanks!

1. make `ref` into method
2. remove accidental inclusion of prototype modal
3. use `omit` for props so that we don’t need a separate object for wrapped component properties
2016-11-14 10:31:40 -05:00
Matthew Taylor
438dbb21e1 Edits based on feedback
thanks @rschamp !
2016-11-14 10:31:40 -05:00
Matthew Taylor
fa380a7148 edit copy/paste error
Thanks @chrisgarrity !
2016-11-14 10:31:40 -05:00
Matthew Taylor
95b6d6bd5c Update microworld iframe modal 2016-11-14 10:31:40 -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
EdwardGeneralov
b2f34adc07 add zulu language menu
Scratch share user
2016-11-14 10:31:40 -05:00
Matthew Taylor
25f61fdb77 Merge pull request #1008 from mewtaylor/issue/gh-980
Implement GH-980: add new TTT modal component
2016-11-14 10:09:00 -05:00
Matthew Taylor
24aa9be30d fix for linting 2016-11-14 09:58:42 -05:00
Matthew Taylor
652c328cbd Last tweaks
thanks @rschamp!
2016-11-14 08:39:19 -05:00
Matthew Taylor
402efd8046 Some last tweaks
based on feedback from @rschamp, thanks!

1. make `ref` into method
2. remove accidental inclusion of prototype modal
3. use `omit` for props so that we don’t need a separate object for wrapped component properties
2016-11-10 17:13:44 -05:00
Matthew Taylor
d2474c87a5 Edits based on feedback
thanks @rschamp !
2016-11-10 15:00:33 -05:00
chrisgarrity
1f8d26186c Add all the banners
Removed the getting started placeholder.
Added all the banners from #980, updated ttt.json with banner location
2016-11-10 11:32:58 -05:00
jwzimmer
8fce4f3e03 update compatibility & support FAQ response 2016-11-10 11:13:10 -05:00
Matthew Taylor
c6cd701464 edit copy/paste error
Thanks @chrisgarrity !
2016-11-10 09:39:52 -05:00
Matthew Taylor
cbaab105f1 Update microworld iframe modal 2016-11-10 09:39:23 -05:00
chrisgarrity
8093814e54 Merge pull request #1003 from EdwardGeneralov/patch-6
Add Zulu to Language Menu
2016-11-10 09:34:44 -05:00
The_Grits
6f35550ff4 Add Tutorials Button
For #1009
2016-11-09 21:32:58 -05:00
chrisgarrity
145da5f872 Styling and formatting clean up pass
Went over styles with Carl. Some notes:
renamed tutorial button tutorial tag as it’s not really a button and is unique to ttt.
Found out why cols4 wasn’t working - if your browser default font isn’t 16px, rem isn’t 16px. Opening a separate issue and using cols4 where it should be.
2016-11-09 21:25:35 -05:00
The_Grits
5fb1dd6230 Thanks Travis
A more thorough search of the error Travis returned helped me realize the problem.
2016-11-09 12:48:39 -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
Matthew Taylor
5af05466f6 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-08 14:44:50 -05:00
Matthew Taylor
c9de1d73d9 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-08 14:44:03 -05:00
Ray Schamp
36b28e69f4 Merge pull request #1004 from LLK/hotfix/hoc-url
[Master] Allow querystring in /hoc URL
2016-11-07 16:39:41 -05:00
chrisgarrity
c6f2fa68a7 First version of TTT page 2016-11-07 15:07:19 -05:00