Ray Schamp
55a45349da
WIP - update phone input
2018-03-30 10:51:22 -04:00
chrisgarrity
53ca763646
Add Error Boundary and Crash message
...
Added all the strings to general l10n as error boundary/crash message applies to all pages.
2018-03-30 10:51:22 -04:00
Ray Schamp
f375130190
Remove unrecognized props from Input
...
In the process, make Input into a stateless component, since apparently this state isn't ever changed.
2018-03-30 10:49:58 -04:00
Ray Schamp
34f39b1c0b
Update to React 16, and dependent packages
...
The Splash page renders with this commit.
2018-03-30 10:49:58 -04:00
Ray Schamp
61c2bb148a
Use country data from an NPM package
...
To prepare to upgrade react-telephone-input which removed this module
2018-03-30 10:49:58 -04:00
chrisgarrity
b7900aca05
Merge pull request #1833 from chrisgarrity/feature/preview-project
...
Feature/preview project - part 1 (elements 'above the fold')
2018-03-21 10:29:01 -04:00
chrisgarrity
1b2050c58a
cleanup
2018-03-20 20:19:48 -04:00
Joel Gritter
316a36f1ed
Fix gh-1824: Add note about real names ( #1830 )
...
* Add note about real names as a new string
Fixes gh-1824
2018-03-16 16:18:17 -04:00
chrisgarrity
1c6b0dd64c
Cleanup
...
Fixing lint problems and removing (most) unused code. I left user and session as they will get used soon even though they aren’t currently.
2018-03-15 17:40:16 -04:00
chrisgarrity
9545e53c98
Close registration when full
...
Hotfix ready to deploy when conference registration has filled up.
2018-03-15 09:00:49 -04:00
chrisgarrity
f836c6e3a8
Adding in remix metadata
...
- Moved preview state into redux
- Gets remix credit if the project is a remix
- Shows up to 5 remixes (direct children?)
- handles empty remixes result (it’s not an array)
- Added Column component - based on Grid, but doesn’t use frameless to set width.
- allows trailing ‘/‘ on the URL
- cleaned up conditional content
2018-03-14 15:50:27 -04:00
chrisgarrity
79199d6d32
Placeholders for everything ‘above the fold’
2018-03-08 15:57:19 -05:00
Kerr Travers
2d98faf160
Update footer.jsx
2018-02-14 16:32:24 +00:00
chrisgarrity
aff3c33817
Merge pull request #1796 from chrisgarrity/hotfix/conf2018-feb5
...
[DEVELOP] Hotfix Conference page to close session proposals
2018-02-05 08:41:27 -05:00
Linda
358ac9a5b9
fixes #1764/reduce string duplication in teaacher registration ( #1791 )
2018-02-01 17:25:55 -05:00
Ray Schamp
25a1280cca
Merge pull request #1759 from towerofnix/fix-firefox-focusring
...
Hide Firefox focus ring on <select> elements (language selector)
2018-02-01 09:29:09 -05:00
chrisgarrity
2989857dbe
Update Conference page to close session proposals
...
Fixes #1782 , needs to be hotfixed on Feb 5
2018-01-31 17:14:42 -05:00
Ray Schamp
590f505a61
Revert "Merge pull request #1788 from LLK/revert-1775-hotfix/es6-upgrade"
...
This reverts commit 1b1b396e92
, reversing
changes made to a144bab0e6
.
2018-01-30 11:53:12 -05:00
Ray Schamp
46511e1253
Revert "[Develop] Upgrade to ES6"
2018-01-30 09:54:45 -05:00
Ray Schamp
99c1f3f0b8
Avoid adding click event properties to formData
...
Setting onClick to onNextStep directly caused click event data to be passed in handleAdvanceStep, which then merged it with the formData state in student registration. This caused issues.
2018-01-29 14:00:29 -05:00
Ray Schamp
2df911259d
Disable no-multi-comp completely for steps.jsx
2018-01-29 14:00:29 -05:00
chrisgarrity
404dc4b04c
Ensure dropdown links are always white
...
Add state pseudo classes to make the style more ‘specific’
2018-01-29 10:54:32 -05:00
chrisgarrity
4633086bf3
Remove blue outline around modals
2018-01-29 08:56:03 -05:00
Ray Schamp
2a64d61fed
Fix registration modal close behavior
2018-01-25 15:01:42 -05:00
Ray Schamp
6036fa79bc
Fix homepage row links
2018-01-25 14:48:09 -05:00
Ray Schamp
d5411ca20b
Fix dropdown opening
2018-01-23 13:58:09 -05:00
Matthew Taylor
6d1f2fbccd
initial es6 commit
2018-01-19 14:06:26 -05:00
Florrie
9e487c8527
Fix CSS rule order
2018-01-12 11:51:11 -04:00
Florrie
ab107f865c
Hide Firefox focus ring
...
See this StackOverflow answer: https://stackoverflow.com/a/18853002/4633828
This isn't a perfect fix - we have to set `color` explicitly, rather
than use `inherit`, because we want the text color to be the same when
the select element is focused. That means both `color` and
`text-shadow`'s color have to be explicitly set to the same thing
(otherwise they might not match). Yay, hacks!
2018-01-05 13:37:06 -04:00
Florrie
870b916db3
Only transition border property
...
..since it's the only property which actually animates. (The background
image also changes on hover/focus, but that isn't visually effected by
transition, so we ignore it.)
This is for the next commit. Without this, the focus ring slowly
disappears, and the text slowly becomes the color it's meant to be;
neither of those are good.
2018-01-05 13:34:57 -04:00
Matthew Taylor
53acea2112
Merge pull request #1670 from mewtaylor/issue/whats-happening
...
Implement GH-1628: Use new activity endpoint
2017-12-18 14:59:10 -05:00
chrisgarrity
ec507b73c5
Merge pull request #1654 from chrisgarrity/feature/hoc-2017
...
Top and middle banners for HoC 2017
2017-12-01 13:22:31 -05:00
Matthew Taylor
bfff01f024
Merge branch 'hotfix/avatar-endpoint' into develop
...
* hotfix/avatar-endpoint:
fall back to default image if thumb not found
2017-11-29 08:04:17 -05:00
Matthew Taylor
02da6f62a6
fall back to default image if thumb not found
...
This incorporates a fallback image into the thumbnail component for all of project, studio and avatar thumbnails using the `onerror` property of img elements (which is supported across all browsers).
/cc @thisandagain @rschamp
2017-11-29 08:03:48 -05:00
Matthew Taylor
ea90dc9309
Merge pull request #1699 from mewtaylor/hotfix/avatar-endpoint
...
[Develop] Hotfix: Change avatar to use `uploads` endpoint
2017-11-28 15:33:14 -05:00
Matthew Taylor
be7e83db78
Change avatar to use uploads
endpoint
2017-11-28 14:01:55 -05:00
Sheshank Shankar
3e52bc7fc5
Make Conference logo button link to homepage.
2017-11-21 16:51:11 -08:00
Sheshank Shankar
4f14dfcbe3
Fixes #1633 - Scratch Conference 2018 Website Phase 1 ( #1673 )
...
* add 2018 conference page (new subdirectory and index page)
* Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences.
* Update mailto link in the footer
2017-11-21 09:19:37 -05:00
Sheshank Shankar
2ba03708c3
Fixes #1633 - Scratch Conference 2018 Website Phase 1 ( #1673 )
...
* add 2018 conference page (new subdirectory and index page)
* Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences.
* Update mailto link in the footer
2017-11-20 09:12:12 -05:00
Matthew Taylor
91a0e865ad
Use new activity endpoint
...
This also moves homepage row retrieval into redux to further move towards using redux to handle functionality. This implements #1628 .
2017-11-15 12:49:23 -05:00
chrisgarrity
60a2a51bb5
minor formatting changes for consistency
2017-11-08 09:04:33 -05:00
chrisgarrity
4fe3997df4
Top and middle banners for HoC 2017
...
Css animated top banner
Middle banner of activities - responsive
https://github.com/LLK/scratchr2/issues/4869
Also updated ttt see-more/open- modal link to be consistent with the new icon from Carl.
2017-11-03 16:50:26 -04:00
The_Grits
cfa55d98e8
Fix gh-1588: Localize "it's free!" String ( #1594 )
...
* Add it's free string
* Add it's free string into page
* Update presentation.jsx
2017-10-23 11:11:33 -04:00
Matthew Taylor
a1675cbb7d
hide overflow on comment component ( #1611 )
...
fixes #1568 by imposing a hidden state on overflow text.
2017-10-11 10:09:02 -04:00
Matthew Taylor
426259fbe8
Merge pull request #1542 from mewtaylor/issue/manager-thumbnail-activity
...
[Develop] Hotfix: use recipient thumbnail, not actor for manager activity
2017-09-13 14:11:50 -04:00
Matthew Taylor
d4b0207bb0
clean up stuff
2017-09-13 13:51:17 -04:00
Matthew Taylor
98cbfd638f
use recipient thumbnail, not actor for manager activity
...
Fixes an issue where the thumbnail mismatches the username presented
2017-09-13 13:47:27 -04:00
Matthew Taylor
16a5208624
Merge pull request #1477 from Petroochio/IS-1195-radio-button-tabbing
...
Fix issue 1195 registration gender tabbing
2017-09-13 08:26:37 -04:00
Matthew Taylor
057f741f89
highlight unread message row in light blue
...
This addresses issues with seeing unread notifications by highlighting them as light blue, along with more opaque icons
2017-09-11 09:59:24 -04:00
Matthew Taylor
a90dd6e296
remove debug message
2017-09-09 16:59:39 -04:00
Matthew Taylor
ffa6b7d376
call as anonymous method
2017-09-09 16:55:43 -04:00
Matthew Taylor
7917f15874
fix parentheses around interval
2017-09-09 15:56:01 -04:00
Matthew Taylor
d18fd0064b
change width to min-width on icon
...
fixes #1521 but no idea why **shrug**
2017-09-08 18:09:55 -04:00
Matthew Taylor
9e3823e6e7
add icons to social message notifications
2017-09-08 14:10:46 -04:00
Matthew Taylor
7a3290a2ca
show recipient for owner notification
2017-09-07 14:55:48 -04:00
Matthew Taylor
ce88466ee4
tweak formatting for message content
...
helps with comment formatting
2017-09-06 11:41:26 -04:00
Matthew Taylor
b77e278927
handle logout on messages page ( #1503 )
...
Go back to redirecting to splash on logout, and empty messages page too.
2017-09-05 14:31:10 -04:00
Matthew Taylor
e9f54b3fd3
use border-bottom, not top
...
this fixes an issue with comment bubble displays in firefox
2017-09-05 10:06:27 -04:00
Matthew Taylor
3dd768f2f6
GH-1361: Implement Notifications Page ( #1487 )
...
* start work on www page
committing out of paranoia.
including changing splash page endpoints
* updates from feedback
thanks @rschamp! This includes:
1. splitting out messages list into a separate component (for clarity)
2. some comment/formatting adjustments for the api calls
3. removal of an extraneous property in emoji-text
* remove duplicate string declaration
* use object.assign instead of defaults deep
we don’t need deep defaults
* fix react warnings
2017-08-31 17:05:22 -04:00
Peter Gyory
69effaac79
Fix issue 1195 registration gender tabbing
...
Add focus highlight scss for radio buttons
on demographic registration step
2017-08-21 15:13:49 -06:00
Matthew Taylor
8561385324
Update name for legacy carousel
2017-07-20 13:56:11 -04:00
Matthew Taylor
cb4ca51061
Add new carousel component
...
1. Moves carousel to `LegacyCarousel` since it currently is designed to handle JSON from proxy endpoints
2. Add separate `Carousel` endpoint to handle data from project models in scratch’s new api, the standard moving forward.
2017-07-20 13:47:14 -04:00
Ray Schamp
84a37a671f
Remove SmartyStreets API
...
We are so lax with this that it's not actually helping us, and we don't have a plan with them anymore.
2017-07-13 10:44:50 -04:00
Matthew Taylor
b22aaa8465
Add /store
to footer
2017-06-26 10:35:29 -04:00
Matthew Taylor
c1e5c7cb03
Change help
to tips
in footer
...
Fixes #1364
2017-06-23 11:55:43 -04:00
Andrew Sliwinski
124c8e36d7
Update navigation. Resolves GH-1262 ( #1285 )
2017-06-22 09:40:34 -04:00
chrisgarrity
74e315dc71
Add new Tips page ( #1357 )
...
New of tips page, uses cards from new resources server (s3)
* added get-localized-urls script to get the generated json from the s3 bucket
* added /tips route
* correct localized-urls for other pages
* remove thingstotry
* redirect /go
* fix up /info/cards view to use resources (s3).
* redirect /go to /tips
* change /hoc redirect from /go to /tips
* Add full set of cards pdf download to tips localization
* removed cards and guides from static PDFs, they are all coming from resources.scratch.mit.edu now.
* removed things to try view
Corrections for reviews:
* decided to pretty print the localized URLs
* replaced console.errors with process.stdout and fail with exit(1)
* formatted localized-urls to make it easier to read
* moved link outside `<Button…` makes whole button clickable instead of just text
* fixed up css styles, removed unnecessary classes
* corrected “unused” resource links
2017-06-21 16:20:18 -04:00
Matthew Taylor
cf863fb3d3
point links at /download
2017-06-16 10:14:01 -04:00
The_Grits
f589ed0f4d
Update dropdown.scss
2017-05-08 10:10:24 -04:00
The_Grits
8ae401e861
Move mobile rule
2017-05-03 15:58:14 -04:00
The_Grits
83baa2ada6
import frameless
2017-04-26 23:14:50 -04:00
The_Grits
8f827d812a
Re-add min-width for mobile
2017-04-26 23:13:24 -04:00
Matthew Taylor
aed3093bc0
Change invalidation to year
2017-04-21 07:51:03 -04:00
Matthew Taylor
f61fe17353
use birthOffset
for age validation
...
Fixes #1278
2017-04-20 16:47:35 -04:00
Matthew Taylor
76c46be17b
Merge pull request #1269 from mewtaylor/issue/r2-4470
...
Fix R2-4470: Only allows birthdays >= 13 yrs old for teacher reg
2017-04-19 16:41:09 -04:00
Matthew Taylor
cd3fb9245a
Only apply offset to teachers
...
thanks @chrisgarrity!
2017-04-14 14:18:32 -04:00
The_Grits
7c9f6f4fad
Fix gh-728
...
Fixes mis-aligned nav-bar dropdown
2017-04-14 06:46:50 -04:00
Matthew Taylor
2c472b607a
Only allows birthdays > 13 yrs old for teacher reg
...
Helps fix https://github.com/LLK/scratchr2/issues/4470 from the UX side of things
2017-04-12 17:41:43 -04:00
The_Grits
bc43e89d36
Remove localization of Scratch Day
2017-03-20 11:05:52 -04:00
Matthew Taylor
0bb60700ba
Merge pull request #1244 from mewtaylor/issue/opt-in
...
[Develop] Hotfix: re-add checkbox to opt-in to email list for teacher
2017-03-15 10:15:16 -04:00
Matthew Taylor
63c6bf59f2
Merge pull request #1149 from mewtaylor/issue/r2-4092
...
For R2-4092: Add checkbox to opt-in to teacher emails
2017-03-15 10:08:35 -04:00
The_Grits
86b5e462c6
Between, not Around
2017-03-06 16:34:21 -05:00
Matthew Taylor
8d2a43530e
Merge pull request #1205 from TheGrits/patch-2
...
Fix gh-1183: Remove slashes
2017-03-06 10:11:43 -05:00
The_Grits
82af7786a0
Put back some slashes
2017-02-28 09:38:43 -05:00
Matthew Taylor
eb56b27a88
Update otherDisabled
check
...
Fall out from #1217 . We should likely change the way this is set up, it seems not ideal. But not sure the best way atm.
2017-02-23 10:57:27 -05:00
Matthew Taylor
f59774bd0d
Don’t localize an empty string
2017-02-23 09:52:33 -05:00
Matthew Taylor
7a2e7cc949
Some additional tweaks for conference 2017
...
1. Updates svgs for formatting
2. Makes the font size of the title smaller
Fixes #1211 , 5-6 in #1206
2017-02-23 09:39:57 -05:00
The_Grits
b75fb7debe
Remove slashes
2017-02-22 11:14:12 -05:00
Matthew Taylor
dd940235cd
Add language chooser to conf footer
...
thanks @jwzimmer!
2017-02-22 10:31:40 -05:00
Matthew Taylor
1b0de13d63
Merge pull request #1192 from mewtaylor/issue/conference-fixes
...
Bugfix: Some copy fixes for new conference page
2017-02-22 09:25:56 -05:00
Matthew Taylor
b139f0a606
Additional conference fixes
...
1. border on flags
2. `Conferences` in nav
3. mailto for costa rica
2017-02-22 08:03:16 -05:00
Ray Schamp
d6093f19b0
Fix React key warnings
...
The number of warnings was locking up my browser, making it hard to test things out.
2017-02-20 11:04:41 -05:00
Matthew Taylor
06ebc88287
Change footer for 2017
...
Take out sponsors
2017-02-17 13:13:03 -05:00
Matthew Taylor
4e65e34275
Merge pull request #1184 from mewtaylor/issue/gh-1086
...
Conference 2017: add new landing page, and archive old site
2017-02-16 07:56:21 -05:00
Matthew Taylor
8b772737a3
Add 2017 conference site
2017-02-15 08:35:10 -05:00
Matthew Taylor
67a39e4870
Archive 2016 site
...
move to a subfolder, do some css shuffling and add some trello style guide stylings to help scope for also adding 2017
2017-02-15 08:34:46 -05:00
Ray Schamp
05adcde88d
URI-encode search string on form submit
...
This prevents the search form from setting an invalid URL.
Resolves #1153
2017-02-10 18:51:42 -05:00
Ray Schamp
22802f87e8
Merge pull request #1160 from TheGrits/patch-3
...
Fix gh-1159: Add 2017 to Teacher Registration
2017-02-01 12:44:23 -05:00
Matthew Taylor
ca0985571e
Revert "Merge pull request #1149 from mewtaylor/issue/r2-4092"
...
This reverts commit 8e82398255
, reversing
changes made to e1a0e9fece
.
2017-01-31 11:38:50 -05:00
Matthew Taylor
6363a16b47
Merge pull request #1151 from mewtaylor/issue/r2-4219
...
For r2-4451: Change password reset anchor text
2017-01-20 07:49:34 -05:00
Matthew Taylor
b2c32c465a
Merge pull request #1138 from mewtaylor/issue/gh-1097
...
Fix GH-1097: Don’t validate username server side unless it passes client-side checks
2017-01-20 07:48:49 -05:00
Matthew Taylor
8e82398255
Merge pull request #1149 from mewtaylor/issue/r2-4092
...
For R2-4092: Add checkbox to opt-in to teacher emails
2017-01-19 18:37:11 -05:00
chrisgarrity
e1a0e9fece
Fix GH 1102: Don’t allow duplicate strings in a single l10n file ( #1150 )
...
* Don’t allow duplicate strings in a single l10n file
Added check_duplicate_strings to test for duplicates in a single file.
removed duplicates - tried to keep the more generic ‘key’
* revised test case for safer file reads
2017-01-19 18:23:56 -05:00
Matthew Taylor
e1665c2b34
Change password reset anchor text
...
This is part of https://github.com/LLK/scratchr2/pull/4451
2017-01-19 11:12:54 -05:00
Matthew Taylor
313f267cfe
Add checkbox to opt-in to teacher emails
2017-01-17 15:57:15 -05:00
Matthew Taylor
6c589e1dc7
remove test ref
...
whoopsie :)
2016-12-28 10:03:11 -05:00
Matthew Taylor
5da9514f4d
Don’t validate username server side if error
...
Fixes #1097 by not making the server-side username validation call if the client side validations have failed. This is not the ideal way to do this, since it’s getting the input from an array. However, to make this different would require significant refactor.
2016-12-28 09:54:46 -05:00
morantsur
e95caef368
Merge branch 'develop' into microworlds_projects
2016-12-20 13:02:46 -05:00
morant
012321721c
Remove isRequired from description and onGuideClick, and fix naming on l10n strings.
2016-12-20 12:58:16 -05:00
morant
485d3903e0
- Fix routes
...
- move functions to inline rendering in ttt-tile and mw homepage
2016-12-20 12:06:58 -05:00
Matthew Taylor
ccd6713ef1
get formatMessage
from props
...
Fixes #1125 . I had fixed this last iteration, not sure how it got re-introduced.
2016-12-18 22:08:17 -05:00
morant
7bbb498a4f
- Stop using ttt cscc files, and remove all references to ttt that are not needed.
...
- Update translation strings that are specific to microworlds to have microworlds as prefix.
- Address other comments
2016-12-16 12:18:16 -05:00
morant
e3025ea3e9
Added a microworlds homepage, based on the ttt page, at /microworlds/go.
...
Changed ttt-tile to only show “see guides…” if they exist.
2016-12-15 16:59:48 -05:00
Matthew Taylor
0111278fa5
Update id string for general error message strings
...
Fixes #1112 , which was created by moving the error message into `general`
2016-12-15 15:32:40 -05:00
Matthew Taylor
ba50840809
only apply right margin to radio input
...
fixes #1101 . I wanted to apply a custom class to the input, however that is unfortunately obscured and unreachable with our current implementation of `formsy-react-components`
2016-12-13 12:11:24 -05:00
Matthew Taylor
cbd983baf8
Merge pull request #932 from TheGrits/patch-3
...
Fix gh-678: Retain Search Term
2016-12-12 22:52:38 -05:00
The_Grits
0b2c1fff1a
Squish
2016-12-12 16:01:06 -05:00
Matthew Taylor
11828d2d44
Merge pull request #1099 from mewtaylor/issue/gh-966
...
Fix GH-966: Localize default “required” message
2016-12-08 09:35:57 -05:00
Matthew Taylor
9ae4e5a963
Move validationRequired
into general
...
thanks @rschamp!
2016-12-07 17:24:48 -05:00
Matthew Taylor
6be9fc1084
Localize default “required” message
...
Fixes #966 . I was trying, if possible, to not introduce localization at the component level in order to keep it in the views – but that seemed a bit too involved given that the fix in this way is only a few lines long.
2016-12-06 11:36:24 -05:00
Matthew Taylor
afa25dc1c2
Move other input to be the label for the button
...
thanks @rschamp! Never would’ve thought label would accept html.
2016-12-05 14:05:27 -05:00
Matthew Taylor
cc0496619d
use width for radio buttons, not margin
...
This fixes #962 – the margin was causing flex to overflow the radio buttons when the text was long, causing the male and other options to render on top of each other. This fixes that by giving the radio buttons a fixed with relative to the parent container, and by ensuring that languages with long localizations will still be visible in overflow text.
2016-12-05 12:53:04 -05:00
Matthew Taylor
2e7336ff55
Merge branch 'feature/gh-981' into release/hoc-nov-21
...
* feature/gh-981:
Add hoc banner
Move padding to splash element
trello-ize title banner h1,p styling
# Conflicts:
# src/components/title-banner/title-banner.scss
# src/views/hoc/hoc.jsx
2016-11-23 11:17:47 -05:00
Matthew Taylor
0c9f2561f9
Merge branch 'release/hoc-2016-1' into release/2.2.15
...
* release/hoc-2016-1:
Merge pull request #1027 from TheGrits/patch-7
Additional content changes
Fix TTT content
Redirect hoc page to `/go`
Merge pull request #1037 from chrisgarrity/patch-column-count
update ttt content
Update ttt content
Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
Merge pull request #1018 from mewtaylor/issue/gh-995
Merge pull request #1008 from mewtaylor/issue/gh-980
Update pattern so rewrite accepts querystring too
# Conflicts:
# src/components/modal/ttt/modal.jsx
# src/views/jobs/jobs.jsx
# src/views/thingstotry/l10n.json
2016-11-21 15:01:53 -05:00
chrisgarrity
58656aea17
Additional content changes
...
- new FlyCards.pdf (fixes shortcut url on title page)
- changes ‘download’ to ‘open’ for PDFs
2016-11-21 11:06:12 -05:00
chrisgarrity
bb777baf4c
Fix TTT content
...
ttt.subtitle:
- ‘try theTutorial’ instead of ‘try a Tutorial’
- Hide and Seek instead of Hide-and-Seek Game
- change <b> to <strong>
title-banner.scss
- add explicit rule to bold <strong> within title-banner for windows browsers
2016-11-21 11:06:02 -05:00
chrisgarrity
b58163c420
Merge pull request #1037 from chrisgarrity/patch-column-count
...
fix column count for IE and Edge
2016-11-18 17:42:20 -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
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
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
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
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
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
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
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
chrisgarrity
c6f2fa68a7
First version of TTT page
2016-11-07 15:07:19 -05:00
The_Grits
21941ecf86
Phone Number 'Required' Validation
2016-11-04 11:51:48 -04:00
The_Grits
8be3e11486
Travis and Other Stuffs
2016-10-31 10:19:35 -04:00
The_Grits
10e49d87b3
Empty Phone Number Validation
...
Separated the null check from the area code check so that when the field is null the 'required' popup will be displayed.
2016-10-26 14:15:54 -04:00
chrisgarrity
29b104741f
Added tests for duplicate strings in build-locales merge
...
Also took out default messages for strings that are in the l10n json files.
2016-10-12 09:41:06 -04:00
Matthew Taylor
99cedec978
Put label for “Not Required” above input
...
Fixes #933
2016-09-30 15:02:05 -04:00
Matthew Taylor
bd911c52d1
Merge pull request #867 from morantsur/feature/microworlds
...
Adding routes to microworlds
2016-09-12 12:06:27 -04:00
Matthew Taylor
2e3aee25d9
cover undefined
case as well
...
thanks @rschamp!
2016-09-01 16:22:45 -04:00
Matthew Taylor
ffa249c3c5
Check for username before sending
...
the `//` for an empty username that gets sent to the backend causes a 500 error. This is an edge case in formsy, as it has not detected a change value yet, so handle it in the username validation method. Fixes #872
2016-09-01 14:59:02 -04:00
Matthew Taylor
e7b0415a6b
Only require zip code for US addresses
...
Since we only check for the US, only require for that country. Other countries have zip codes, but it seems better to do it this way than codify which countries do/do not have zip codes (in case local practices are not the same as international information). Fixes #825
2016-08-26 11:14:26 -04:00
Matthew Taylor
5dd80c1020
additional reformatting
2016-08-24 10:55:13 -04:00
Matthew Taylor
fb5d9788f8
Re-structure grid styling a bit
...
combine stylings where possible, re-name some of the variables to be used more often
2016-08-24 10:24:01 -04:00
Matthew Taylor
28f96a1d0d
Align grid items on the left
...
use `flex-start` with margins to ensure proper spacing between, while still starting at the left of each row.
2016-08-24 10:23:26 -04:00
Technoboy10
f0703b9f46
fix styling error
2016-08-23 09:26:22 -06:00
Technoboy10
55f95bb2a8
remove inactive class on tabs
2016-08-23 09:26:22 -06:00
Technoboy10
f27e99f1a4
move card styling to grid.scss, use card as default grid style
2016-08-23 09:26:22 -06:00
Technoboy10
017df9da20
redo tabs component
2016-08-23 09:26:21 -06:00
Technoboy10
3fa6fa95fd
add card display to grid and thumbnail components
2016-08-23 09:26:21 -06:00
Technoboy10
55163d2c86
more work on user avatar in thumbnail
2016-08-23 09:26:21 -06:00
Technoboy10
432b621079
wip
2016-08-23 09:24:44 -06:00
Technoboy10
f883ecfbae
commit changes
2016-08-23 09:24:44 -06:00
morant
28aa4f0b2c
Fixing microword pages and adding routes to them.
...
- Remove temp "open in Scratch" button, now that we have a permanent one.
- Fix microworld pages to work with new changes to environment.
- Fix alignment issues.
- Connect routes to microworld pages.
- Add soccer microworld.
- Comment out videos and tips from arts microworls, so it can be shown publicly.
2016-08-22 13:31:44 -04:00
Matthew Taylor
70eb82f7cb
remove .card
-specific stylings
2016-08-19 15:16:35 -04:00
Matthew Taylor
baf0676f99
move .validation-message
out`
...
It doesn’t need to be specifically styled, as we have no use for it inside `.card` but outside `.row` yet. Thanks @rschamp!
2016-08-19 15:06:12 -04:00
Matthew Taylor
bc0263531b
align gender/org input msg with others
...
Because the `input` field is already to the right, they were being transformed too far over. This overrides the transform to be correct, and also scopes some css in more detail
2016-08-19 14:11:24 -04:00
Matthew Taylor
41a0ef73ba
Add missing strings for translation
...
1. Explore page header
2. “by” in the project thumbnail
2016-08-16 08:55:32 -04:00
Matthew Taylor
b893c5c657
Merge pull request #845 from mewtaylor/issue/new-languages
...
Add fur, sq and te to language list
2016-08-16 08:45:28 -04:00
Matthew Taylor
54e9980808
Merge pull request #847 from mewtaylor/issue/gh-835
...
For GH-835: eliminate max height of validation messsage
2016-08-16 08:14:09 -04:00
Matthew Taylor
bb37d4be57
eliminate max height of validation messsage
...
now that it’s not centered but rather top/down, we don’t need this anymore
2016-08-16 08:08:48 -04:00
Matthew Taylor
f3de2d1d28
re-order languages
...
and also get language for dropdown from `IntlProvider` rather than the window, so that we have one point of truth
2016-08-15 14:53:31 -04:00
Matthew Taylor
59d558116e
Merge pull request #836 from mewtaylor/issue/gh-760
...
Fix GH-760: Add username `not equals` to password validation
2016-08-15 13:29:46 -04:00
Matthew Taylor
e791c0a8ff
Merge branch 'issue/gh-835' of https://github.com/mewtaylor/scratch-www-1 into develop
...
* 'issue/gh-835' of https://github.com/mewtaylor/scratch-www-1 :
Switch ordering
Remove `option` warning in console
Add `maxLength` validations where needed
# Conflicts:
# src/components/registration/steps.jsx
2016-08-12 17:23:32 -04:00
Matthew Taylor
61ef3c2c69
Switch ordering
...
so `intl` comes first
2016-08-12 16:43:56 -04:00
Matthew Taylor
0d9493de12
Remove option
warning in console
...
`option` throws an error in React if it’s not a string. `FormattedMessage` returns a `span` around strings, so any time this function was loaded/called, it was throwing >100 warnings in the console. use `intl` to return a string instead.
2016-08-12 15:47:44 -04:00
Matthew Taylor
6d5bb4f850
Add maxLength
validations where needed
...
fixes #835
2016-08-12 15:39:39 -04:00
Matthew Taylor
f8de61f067
Update from feedback
...
use props for username rather than constructed form data, and `studentUsername -> username`. Thanks @rschamp!
2016-08-12 10:11:14 -04:00
Matthew Taylor
cbf76ec636
Clean up a few lint warnings
2016-08-12 08:10:42 -04:00
Matthew Taylor
537104c56b
Add username validation to student complete registration
...
Fixes #760
2016-08-12 08:10:20 -04:00
Matthew Taylor
6e3a18a574
only look for empty phone on submit
...
thanks @rschamp!
2016-08-10 09:45:21 -04:00
Matthew Taylor
56e88685b5
Check for empty phone number on submit
...
Thanks @rschamp!
2016-08-10 09:38:43 -04:00
Matthew Taylor
30945bc078
Remove phoneLength
validation
2016-08-10 07:53:49 -04:00
Matthew Taylor
56481c797e
Remove phoneLength
validation
...
It appears that some valid phone numbers in some countries differ in length from what is specified in the util’s phone number format. Fixes #816 .
2016-08-10 07:47:12 -04:00
Connor Hudson
f49d6e6a83
Merge pull request #767 from technoboy10/mobile-nav-footer
...
Fix GH-217: Implement responsive nav and footer (woohoo!)
2016-08-09 15:09:01 -04:00
Technoboy10
c009497b6b
use scss in navbar instead of react-responsive
2016-08-09 09:55:20 -04:00
Matthew Taylor
f3c4276d0f
Merge pull request #814 from St19Galla/patch-1
...
Fix GH-812 / Enhance Checkbox Display
2016-08-08 10:20:09 -04:00
Matthew Taylor
606e3600ba
Merge pull request #803 from mewtaylor/issue/gh-683
...
Fix GH-[683,705,712,797]: Updates to registration UX for teachers
2016-08-08 08:10:24 -04:00
St19_Galla
a7ea6d7fd9
whoops, don't need that anymore
2016-08-05 15:51:48 -04:00
St19_Galla
ef55f20ff3
now i finally understand scss variables
2016-08-05 15:50:51 -04:00
St19_Galla
3ff81296a7
test
2016-08-05 15:43:15 -04:00
St19_Galla
dd85de22e6
Enhance Checkbox Display
2016-08-05 15:24:33 -04:00
Matthew Taylor
73fbc36ff9
declare callback if undefined
2016-08-03 16:24:51 -04:00
Matthew Taylor
86662e13d6
Consolidate and remove onValidSubmit
2016-08-03 15:20:58 -04:00
Matthew Taylor
4e568f7c06
use minLength instead
...
it’s the same thing :). Thanks @rschamp!
2016-08-03 14:34:07 -04:00
Matthew Taylor
cec3214def
some updates from feedback
...
thanks @rschamp!
1. moved org type validation to a custom validation
2. added a callback to the username validation call
2016-08-03 12:11:55 -04:00
Technoboy10
fdfbf57e28
fix file location
2016-08-02 16:50:40 -04:00
Technoboy10
c19c32ded3
fix merge conflicts from upstream/develop
2016-08-02 16:50:23 -04:00
Technoboy10
ed924e3b2c
add space back in
2016-08-02 15:30:01 -04:00
Matthew Taylor
f0c2280fde
Updates to registration UX for teachers
...
1. Phone too long validation occurs before submit now.
2. Organization “other” type is now being required
3. Organization type required now shows up at the same time as other organization validation errors
4. Username check now occurs earlier, on blur rather than on submit
2016-08-02 15:23:09 -04:00
Ray Schamp
0e6a7e6fdc
Merge pull request #794 from rschamp/hotfix/activate-teacher-registration
...
[Develop] Add "Request Account" button to Educators landing page
2016-08-02 10:55:43 -04:00
Technoboy10
63c67a1d2d
use frameless.js for carousel breakpoints
2016-08-02 09:17:13 -04:00
Ray Schamp
025958fc24
Add align
prop to SubNavigation
component
2016-08-01 12:18:25 -04:00
Matthew Taylor
4909d509d2
remove ie fallback to mobile styling
...
it looks like @rschamp’s wodnerful `top` alignment fix for Chrome and Edge also helps here, from a test I did in IE11.
2016-07-28 15:46:56 -04:00
Matthew Taylor
d97bc193df
Remove unnecessary redefinitions
...
These are already defined in the base, and are not overridden anywhere. Only redefine the things that were overridden.
2016-07-28 15:11:14 -04:00
Matthew Taylor
2c9df3237e
Fix gender input error alignment in IE11
...
Also re-apply the arrow styling on the organization checkbox group, since it appears to be aligned correctly.
2016-07-28 14:10:36 -04:00
Ray Schamp
e218cc5169
Move "select country" to general strings
...
It's reused in the other registration views so doesn't belong in teacherregistration/l10n.json
Fixes #783
2016-07-28 12:26:56 -04:00
Matthew Taylor
9e9ffc96e9
Merge pull request #779 from mewtaylor/issue/gh-773
...
Fix GH-[772,773]: Fix “afterschool” typo, default country and margin for username
2016-07-28 10:52:55 -04:00
Ray Schamp
7e8fddef18
Don't use a static width for inputs
...
Fixes #769
2016-07-28 10:39:18 -04:00
Matthew Taylor
40fb433d7d
Make country choice a function that’s called
...
And also default the country in address to the country in demographics. Thanks @rschamp @carljbowman!
2016-07-28 09:56:01 -04:00
Matthew Taylor
2650e6e148
Move countryOptions to the global scope
...
thanks @rschamp!
2016-07-28 08:30:29 -04:00
Matthew Taylor
cf4a057278
Fix “afterschool” typo
...
Also make default country selectable in the user demographic step, and fix the spacing with `Create a Username`
2016-07-27 23:33:45 -04:00
Ray Schamp
668f141457
Merge pull request #778 from rschamp/bugfix/chrome-52
...
Set common y-origin for validation bubbles
2016-07-27 20:17:32 -04:00
Ray Schamp
ecbbeb5612
Set common y-origin for validation bubbles
...
I believe this will keep the misalignment from happening across browsers. Sets the top left corner to the top left corner of the input block.
Resolves #770
2016-07-27 20:15:53 -04:00
Ray Schamp
19d67dc0b4
Resurrect old invite step design for new users
2016-07-27 19:32:08 -04:00
Technoboy10
2da07923ca
revert verbiage change as per IRL discussion with Carl
2016-07-27 15:49:48 -04:00
Ray Schamp
89071b10d0
Lint
2016-07-27 14:12:55 -04:00
Ray Schamp
d1f73c3ef4
Redesign invite step, add option to log out
...
Resolves #752
2016-07-27 10:24:37 -04:00
Technoboy10
5e7bf85733
remove redundant media query from footer.scss
2016-07-27 09:48:07 -04:00
Matthew Taylor
806fd25e46
Move to the view
...
thanks @rschamp!
2016-07-26 17:03:41 -04:00
Matthew Taylor
60a62bb374
Redirect to /educators/classes
if a confirmed teacher
...
Fixes #757 . Note: Because we are getting this info from the session, the redirect may not happen until the page is rendered first in cases where the connection is slow, or the db is slow.
2016-07-26 15:24:51 -04:00
Matthew Taylor
e87a2bce76
remove trailing whitespace
2016-07-26 11:24:51 -04:00
Technoboy10
a8b26b1a1c
experiment with removing content display from scss
2016-07-26 11:06:21 -04:00
Matthew Taylor
69ac5b60bd
make .no-label
an auto assignment
...
thanks @rschamp!
2016-07-26 10:44:19 -04:00
Matthew Taylor
b510d154df
remove ‘noformsy` option on inputs
2016-07-26 10:20:06 -04:00
Matthew Taylor
6787ae03ce
Apply classes to row, not textarea
...
And move help rendering into the phone input row.
2016-07-26 08:06:38 -04:00
Matthew Taylor
d8e07ee7f6
use rowClassName
instead
...
so that it can include `label`. Also add some default styling to `label` in `.row`. Thanks @rschamp!
2016-07-25 15:43:44 -04:00
Matthew Taylor
263d292b3c
Fix formatting for a few form elements
...
and make use of the FRC `elementWrapperClassName`, since they way we did it before – custom `className` strings on the element – was not working. Fixes #749 .
2016-07-25 13:21:28 -04:00
Technoboy10
daf803d4a3
experiment with the react-responsive library
2016-07-25 10:53:57 -04:00
Technoboy10
808922b50d
pass layout to navbar and footer
2016-07-22 14:57:05 -04:00
Technoboy10
391344489d
footer mobile
2016-07-22 14:56:14 -04:00
Technoboy10
5b9cef8dd6
navbar mobile
2016-07-22 14:55:56 -04:00
Ray Schamp
7455807591
Provide RegistrationError content as children
...
This allows us to do more inline formatting, so we don't have any of that outside of `render`.
Thanks @mewtaylor
2016-07-22 09:38:37 -04:00
Ray Schamp
be41d004ad
Show password by default
2016-07-21 21:08:07 -04:00
Ray Schamp
3335207c54
Update copy for password step
2016-07-21 21:08:07 -04:00
Ray Schamp
a4dd1611d1
Add student registration update view
2016-07-21 21:08:06 -04:00
Ray Schamp
7a6e5c3eb4
Fix student registration localization
...
Add missing strings, actually translate the content of the steps
2016-07-21 21:08:06 -04:00
Ray Schamp
8dae646ff3
Style tweaks
2016-07-21 20:44:51 -04:00
Ray Schamp
b06a9e49d0
Fix wording on student username step
2016-07-21 20:44:51 -04:00
Ray Schamp
9aa7e828b7
Remove "blank" classroom, show spinner instead
...
It was broken due to a key error on `classroom.images` anyway
2016-07-21 20:44:51 -04:00
Technoboy10
b88b8c83b1
redo responsive nav
2016-07-21 10:12:16 -04:00
Technoboy10
3bbc17bb35
moved ie targeting to steps.scss
2016-07-20 17:29:34 -04:00
Technoboy10
22dc55c030
change verbiage, begin work on responsive nav/footer
2016-07-20 16:53:50 -04:00
Ray Schamp
754859f35f
Update image format for API change
...
Removed default `image` field convention
2016-07-20 13:47:43 -04:00
Ray Schamp
a3b56dcbf1
Fix lint errors, l10n issues
2016-07-20 12:07:19 -04:00
Technoboy10
4e6efae667
Remove IE weird input additions, fallback to mobile error style on IE, fix some mobile error issues
2016-07-20 09:46:51 -04:00
Ray Schamp
6d5b7d3c02
Update description of demographics step
2016-07-19 22:58:50 -04:00
Ray Schamp
1c5940cc05
Add student registration flow
2016-07-19 16:51:28 -04:00
Ray Schamp
67ecb60f48
Make registration styles reusable
2016-07-19 16:49:12 -04:00
Technoboy10
db049b871f
fix IE11 select background, indent issues
2016-07-18 10:17:22 -04:00
Matthew Taylor
845ddb2966
only show username in search and explore
...
fixes #710
2016-07-11 16:35:03 -04:00
Matthew Taylor
075f1481a2
Add custom validation for organization and phone
...
It appears that the `required` field is not applied in the way we'd like it to be for the custom checkbox group and custom phone input fields, so do a `required` check on form submission. Additionally, this adds in a few style fixes. Fixes #695 , #694 , #693 , #691
2016-07-07 16:56:51 -04:00
Ray Schamp
b7c46f483e
Don't error on null children
...
Was throwing a `TypeError` when child was null/undefined.
2016-07-05 15:48:21 -04:00
Ray Schamp
c50ac03a48
Merge pull request #671 from rschamp/bugfix/669
...
Disable default style for select elements in IE
2016-07-05 14:39:58 -04:00
Ray Schamp
edf0c1e475
Disable default style for select elements in IE
...
Fixes #669
2016-07-05 14:39:08 -04:00
Ray Schamp
6f9c16a7a5
Merge pull request #667 from rschamp/bugfix/647
...
Add style to general error messages
2016-07-05 14:18:49 -04:00
Ray Schamp
d990dee755
Move location of the general error message
...
From review of the style with @carljbowman
Requires a bit of magic, where the Form component manually adds the "all" value. But without a major overhaul of the validation system, I don't see how else to put the general error among the other fields.
2016-07-05 12:06:10 -04:00
Ray Schamp
b15b5b8614
Add style to general error messages
...
Resolves #647
2016-07-05 12:03:27 -04:00
Matthew Taylor
2cd8019ef6
Add box shadow for focus state on checkboxes
...
Fixes #628 by applying the same outline for focus as is currently applied to checked boxes.
2016-07-05 11:39:06 -04:00
Ray Schamp
7fe82c11be
Get rid of most splash warnings in development
2016-07-03 14:49:01 -04:00
Ray Schamp
c25852b3c6
Merge pull request #657 from rschamp/bugfix/645
...
Revalidate address step after invalid submissions
2016-07-01 13:48:13 -04:00
Ray Schamp
a56f994886
Revalidate address step after invalid submissions
...
I don't like that the state is being set to a calculation of existing props. When I did that calculation in `render`, it didn't update when fields were changed.
Fixes #645
2016-07-01 11:43:18 -04:00
Technoboy10
2206cb97f6
message icon tweak
2016-06-30 19:17:53 -04:00
Technoboy10
42c000d14f
orangify this
2016-06-30 18:06:17 -04:00
Matthew Taylor
6db426a586
Use empty default object
...
Looks as if the having one of these objects as the default causes overwriting in some way, as opposed to augmentation. Have the source object be an empty one, so that it gets the attributes of both defaults and props. Fixes #642 .
2016-06-30 16:52:46 -04:00
Ray Schamp
5b288e4d3e
Merge pull request #648 from rschamp/feature/username-clarity
...
Clarify username field is not for logging in
2016-06-30 16:17:14 -04:00
Ray Schamp
0816b0ec0f
Clarify username field is not for logging in
2016-06-30 16:16:31 -04:00
Ray Schamp
554e21cd15
Fix localization of address validation message
...
Fixes #608
2016-06-30 15:54:32 -04:00
Matthew Taylor
f2b8e9025d
switch ordering in defaults
...
This was assigning `props` to defaults, rather than the other way around. Fixes #618 .
2016-06-30 08:00:40 -04:00
Matthew Taylor
b874d05bda
Override devault input style for login
...
so that it looks like it used to, and not to tall. Fixes #618 .
2016-06-29 14:54:00 -04:00
Connor Hudson
9bafdf6067
Merge pull request #619 from technoboy10/darken-dropdown
...
Darken Account Nav Link when Menu Open
2016-06-29 13:31:27 -04:00
Technoboy10
41d9b1f526
use classNames before return
2016-06-29 13:24:37 -04:00
Matthew Taylor
8f60b020cb
fix educator faq link
...
`info` is not in there anymore
2016-06-29 12:35:53 -04:00
Matthew Taylor
19bbd5ae7b
Link icon to splash page
...
fixes #623
2016-06-29 10:53:55 -04:00
Connor Hudson
221170a9ff
Merge pull request #616 from technoboy10/gh537-dropdown-gap
...
Fix GH-537: Logged-in user dropdown gap
2016-06-29 08:58:16 -04:00
Technoboy10
52d834c3fa
darken account nav link when menu open
2016-06-28 21:10:33 -04:00
Matthew Taylor
7bb52c25fe
move permissions checks to mirror session more
...
thanks @rschamp!
2016-06-28 14:25:11 -04:00
Technoboy10
c4a98c5571
close gap, use border-box for box-sizing
2016-06-28 13:50:58 -04:00
Matthew Taylor
91de6f7912
Merge pull request #614 from mewtaylor/issue/gh-611-teacher-banner
...
Fix GH-611: Connect `TeacherBanner` to redux
2016-06-27 22:40:13 -04:00
Technoboy10
5f62e5ffaf
scoping tweak
2016-06-24 11:42:35 -04:00
Matthew Taylor
c4a365a0e8
Connect TeacherBanner
to redux
...
whoops! Thanks @rschamp. Fixes #611
2016-06-24 11:40:50 -04:00
Technoboy10
172dd3cd62
set the size of the language chooser
2016-06-24 11:34:11 -04:00
Matthew Taylor
ef881a07f9
Merge pull request #610 from mewtaylor/cleanup/teacher-styling
...
styling cleanup for teacher registration
2016-06-24 11:25:25 -04:00
Matthew Taylor
97516b1e1d
styling cleanup for teacher registration
...
some scoping, as well as class labeling
2016-06-24 11:19:41 -04:00
Technoboy10
93054cf393
change from defaultValue to value because of formsy
2016-06-24 11:13:05 -04:00
Matthew Taylor
92883d3cbe
swap logos in conference footer
2016-06-23 22:46:11 -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
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
Matthew Taylor
86a8f94919
some code formatting tweaks
2016-06-23 15:10:51 -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
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
Ray Schamp
93ed60cd0d
Add teacher waiting room view
2016-06-22 13:35:38 -04:00
St19_Galla
ab2dc47921
Update navigation.scss
2016-06-22 11:22:30 -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