Commit graph

14 commits

Author SHA1 Message Date
Matthew Taylor
1c802f9230 Some translations cleanup
A couple missing translations
2015-12-09 14:03:30 -05:00
Andrew Sliwinski
2fdc6458e0 Address feedback from review 2015-12-08 10:53:12 -05:00
Andrew Sliwinski
aa7efc7e4f Merge branch 'develop' of github.com:llk/scratch-www into feature/about 2015-12-08 10:31:48 -05:00
Ray Schamp
b85775b20f Merge pull request #276 from thisandagain/hotfix/hoc
Hotfix - Legal fixes for HOC page
2015-12-04 13:01:21 -05:00
Andrew Sliwinski
30f4feff48 Hotfix for HOC legal notices 2015-12-04 10:41:25 -05:00
Matthew Taylor
c6507b0eeb Remove fr-ca from language list
See https://github.com/LLK/scratchr2/pull/3108. Also fix typo with `forParents` intro string
2015-12-01 08:44:39 -05:00
Ray Schamp
9c6cf5f449 Fix GH-237: Show My Classes in nav to educators 2015-11-26 12:08:28 -08:00
Andrew Sliwinski
f2561fbc03 Migrate about view. Resolves GH-63 2015-11-18 19:57:07 -05:00
Matthew Taylor
ad8d32474f Update HOC page with new mobile, styling & content
Mobile styling is from the frameless framework from #198 (ht @rthorn!). Localization also in as well.

Use `white-space: normal` instead of `inline-block`

Prep for componetizing Sub-Nav

- Fixed top banner extra margin
- Updated HTML containers and SCSS

Add subnavigation component

Added more content

- More projects (still need photos)
- Added section about Studios (need to create links to studios)

WIP: adding frameless to HOC page

Remove Grid elements on Sections

Made the implmentation more granular with breakpoints in mind.

More formatting adjustments

Cards in box now working.

Update responsive behavior and spacing

Updated all elements to respond to new grid system breakpoints.

Update content and organize HOC assets

- Added studios section with studio elements
- Reorganized the image assets for HOC 2015

Fix SCSS linting errors

Update addtional activities photo assets

Generalize `info` class on subnav

Move onto one line

left-align single-column studio links

Add strings for localization

Some rebase conflicts

Code review feedback

ht @thisandagain!

Fix alignment of studios

Keep `inline-block` for mobile
2015-11-03 23:50:51 -05:00
Matthew Taylor
311c156947 Add missing translations to en.json
Also add `Search` to translatable strings
2015-10-30 10:05:08 -04:00
Ray Schamp
cb2f639d07 Localize the welcome panel 2015-10-22 20:55:17 -04:00
Matthew Taylor
05cfb5e9da Capitalize ScratchEd
Fixes #108
2015-10-21 14:46:51 -04:00
Ray Schamp
50646b6c3c Localize homepage row content 2015-10-20 14:49:25 -04:00
Matthew Taylor
1c338e8394 Add template icu json file
For us, it's in english
2015-10-16 11:05:03 -04:00