Connor Hudson
1da0978029
routes.json
2016-06-23 17:26:28 -04:00
Connor Hudson
53eb56c1df
style tweaks
2016-06-23 17:23:35 -04:00
Matthew Taylor
e71aff5df1
Merge pull request #594 from St19Galla/develop
...
Navbar issues; :hover
2016-06-23 17:20:44 -04:00
St19_Galla
49f6a6bee2
Update navigation.scss
...
Changed padding rather than height
2016-06-23 17:06:40 -04:00
Matthew Taylor
74bd2b3255
Merge pull request #599 from mewtaylor/feature/teacher-registration-flow
...
[Updates] Teacher registration flow
2016-06-23 16:48:58 -04:00
Connor Hudson
7de13d029b
get rid of carousel, make things centered if they need it
2016-06-23 15:46:02 -04:00
Matthew Taylor
0c1abada3a
Small tweaks
...
1. left-align form elements even in mobile
2. Bolden input labels, except for checkboxes and radio elements
/cc @carljbowman
2016-06-23 15:44:14 -04:00
Andrew Sliwinski
a5e12d0d46
Merge pull request #600 from thisandagain/bugfix/ga
...
Move GA tracking code into page head
2016-06-23 15:40:20 -04:00
Andrew Sliwinski
89f8434d71
Move GA tracking code into page head
2016-06-23 15:34:47 -04:00
Matthew Taylor
6aeee284bc
style waiting room
...
also "deep purple" :)
2016-06-23 15:25:22 -04:00
Matthew Taylor
86a8f94919
some code formatting tweaks
2016-06-23 15:10:51 -04:00
Matthew Taylor
10f154ca10
accidentally took this out
2016-06-23 15:10:41 -04:00
Matthew Taylor
f00aedd17e
linter error
2016-06-23 14:27:42 -04:00
Matthew Taylor
1a08e7ae49
Finalize styling for registration flow
...
/cc @carljbowman
One issue we ran into is that our `frameless` configuration is in `em` rather than `rem`, making it difficult to have an aboslute grid applied uniformly at all hierarchies. For now, we're using straight `rem` calculations instead of `$cols{1,8}` in the styling until we can refactor `frameless` to use `em`.
2016-06-23 14:06:36 -04:00
Connor Hudson
6d3d8b7446
more styling
2016-06-23 13:48:18 -04:00
Connor Hudson
c52a6e16e9
attempted mobile styling
2016-06-23 13:18:45 -04:00
Connor Hudson
f0290a7657
Merge pull request #595 from technoboy10/gh572-hoc
...
Fix GH-572: HOC page formatting
2016-06-23 08:14:40 -04:00
Matthew Taylor
1910d38bc6
Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow
...
* 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www :
Add teacher waiting room view
Only pass necessary props to steps
# Conflicts:
# src/components/registration/steps.jsx
# src/views/teacherregistration/teacherregistration.jsx
2016-06-23 07:35:06 -04:00
Matthew Taylor
8fb16bf397
Add formatting for teacher reg flow
2016-06-23 07:27:43 -04:00
Connor Hudson
3624e18e08
inherit line height, remove margin
2016-06-22 16:58:58 -04:00
Connor Hudson
230cadffa5
more styling, carousel
2016-06-22 16:48:58 -04:00
Ray Schamp
93ed60cd0d
Add teacher waiting room view
2016-06-22 13:35:38 -04:00
Connor Hudson
dd249e8b88
add assets for teacher page
2016-06-22 13:18:47 -04:00
Connor Hudson
9c14f7cb3f
create landing page
2016-06-22 13:18:19 -04:00
St19_Galla
ab2dc47921
Update navigation.scss
2016-06-22 11:22:30 -04:00
Ray Schamp
de8ac6c56a
Only pass necessary props to steps
...
Rather than lazily including all form progress to every step, just give each step what it needs.
2016-06-21 18:45:41 -04:00
carljbowman
98fb9a4cc1
Merge pull request #591 from carljbowman/jobs-update
...
Jobs page update
2016-06-21 16:31:52 -04:00
carljbowman
ee8d6bf0c5
Update Jobs page
...
- Add 'Web Designer' position
- Adjusted typography to match new Type Standards
- Add Hex Value to Colors for consistency
2016-06-21 15:00:51 -04:00
carljbowman
53988c2345
Don't lint temporary locale .json files
2016-06-21 15:00:05 -04:00
Matthew Taylor
9d6fb63d18
Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow
...
* 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www : (46 commits)
Add serverside email validation
Clean up
Move registration step to main component
Submit the rest of the fields when registering
This help text is redundant now
Fix organization "other" field enablement
Get the form creating regular accounts
Add method to api for submitting forms
Update language chooser for formsy
Add missing string
Add progress indicators
Style pass
Remove unused label component
Remove unused mixin factory
Fixup api refactor
Add serverside username validation
L10n pass
Explain the GeneralError component
Add help text when a field is not required
L10n WIP
...
# Conflicts:
# src/l10n.json
# src/views/splash/splash.jsx
2016-06-17 15:32:49 -04:00
Connor Hudson
5d12e5773d
Merge pull request #584 from technoboy10/gh554-localize-faq
...
Fix GH-554: Localize FAQ title
2016-06-17 14:47:46 -04:00
Matthew Taylor
b337b47590
Merge pull request #586 from mewtaylor/issue/conference-updates
...
Fix GH-[571,563] – updates to the conference site
2016-06-17 14:14:53 -04:00
Ray Schamp
bf76e88ca2
Add serverside email validation
2016-06-17 13:01:53 -04:00
Ray Schamp
11b9876930
Clean up
2016-06-17 12:22:29 -04:00
Ray Schamp
078463ac25
Move registration step to main component
...
Add a placeholder error step
2016-06-17 12:22:11 -04:00
Ray Schamp
8646bd84b3
Submit the rest of the fields when registering
2016-06-17 11:01:34 -04:00
Ray Schamp
532a1cce57
This help text is redundant now
2016-06-17 11:01:10 -04:00
Ray Schamp
ad5da0f543
Fix organization "other" field enablement
2016-06-17 11:00:48 -04:00
Matthew Taylor
f0b178c290
Merge pull request #583 from mewtaylor/issue/gh-541-faq-schools
...
Fix GH-541: Add "schools" section to faq
2016-06-17 09:39:41 -04:00
Ray Schamp
d7ca0166ab
Get the form creating regular accounts
2016-06-16 17:25:14 -04:00
Ray Schamp
26e1ee553b
Add method to api for submitting forms
...
Some of our legacy endpoints expect this style rather than json.
Also clean up the way useCsrf works — don't always set json attribute to an empty object.
2016-06-16 17:24:31 -04:00
Matthew Taylor
32e9b089c5
updates to the conference site
...
1. new collaborators
2. new sold out language
3. some copy edits
2016-06-16 17:07:22 -04:00
Ray Schamp
d27b0a2433
Update language chooser for formsy
2016-06-16 16:31:13 -04:00
Ray Schamp
9a3b83f8c6
Add missing string
2016-06-16 16:30:59 -04:00
Connor Hudson
1e571d0e2d
localize FAQ title
2016-06-16 15:11:43 -04:00
Matthew Taylor
f5cbdfa2c9
Merge pull request #582 from mewtaylor/issue/teacher-faq
...
Add teacher faq page
2016-06-16 11:31:29 -04:00
Connor Hudson
c188a268e2
Merge pull request #568 from TheGrits/patch-1
...
Fix gh-555: Squished News Icons
2016-06-16 11:17:44 -04:00
Ray Schamp
e062096445
Add progress indicators
2016-06-16 10:54:36 -04:00
Matthew Taylor
b13a388425
Fix typo
...
thanks @technoboy10!
2016-06-16 10:54:35 -04:00
Matthew Taylor
8ef3acd5d9
Merge pull request #560 from mewtaylor/issue/gh-556-footer
...
Fix GH-556: Add "For Developers" to the footer
2016-06-16 10:28:19 -04:00
