Commit graph

261 commits

Author SHA1 Message Date
Connor Hudson
fd1401fe1b used stricter comparison 2016-06-01 16:14:58 -04:00
Connor Hudson
4d65d478ed change to more extensible session 2016-06-01 15:28:18 -04:00
Connor Hudson
e402363576 initial pass 2016-05-31 16:37:42 -04:00
Ray Schamp
7fb512f4a8 Merge pull request #531 from rschamp/feature/cn-banner
[Develop] Homepage module
2016-05-31 12:25:16 -04:00
Ray Schamp
3632f3dc1d Merge branch 'release/2.2.9' into develop 2016-05-31 12:24:21 -04:00
Ray Schamp
89bdeff631 Don't break up navigation on mobile 2016-05-31 09:32:04 -04:00
Matthew Taylor
932dab40c7 Some additional mobile changes 2016-05-29 11:59:53 -04:00
Matthew Taylor
6eeebe05c3 Merge pull request #525 from mewtaylor/issue/conference-tweaks
For GH-497: conference tweaks for fallout from schedule/typography
2016-05-27 16:40:39 -04:00
Matthew Taylor
c351d54e9b fix lint warning
thanks @rschamp!
2016-05-27 16:02:38 -04:00
Matthew Taylor
74ac6e52bb conference formatting tweaks for mobile
thanks @carljbowman!
2016-05-27 15:55:27 -04:00
Ray Schamp
992f6d7481 Update footer and nav styles per @carljbowman 2016-05-27 12:02:22 -04:00
Ray Schamp
986341341b Fix line height and wrapping on splash components 2016-05-27 11:46:35 -04:00
Ray Schamp
2a01ebee84 Fix search button display
Update search form submit button from an input[type=submit] to a button.  React 15 omits the value prop if it's blank, so the `<input type="submit" value="">` was rendered as `<input type="submit">`. This caused the input to display the default value of "Submit".  The button element is more appropriate for this behavior and doesn't have the missing value issue.
2016-05-26 16:00:28 -04:00
Ray Schamp
c966f8a0ba Fix modal layout
The styles in the upgraded react-modal broke our centering.
The auto-focusing on the modal made an annoying blue border around it in Chrome.
2016-05-26 16:00:28 -04:00
Ray Schamp
fe08f8c18f Update final graphic 2016-05-26 14:38:56 -04:00
Ray Schamp
18bb2357c6 Update final copy and links 2016-05-26 14:10:59 -04:00
Ray Schamp
d1f675374b Localize banner 2016-05-24 17:30:48 -04:00
Ray Schamp
448bb8aa3f Add Power Puff Girls banner 2016-05-24 17:14:12 -04:00
Matthew Taylor
a860b27941 Some updates to the redux structure
1. split `auth.js` up so it's 1 reducer per file
2. consolidate the conference schedule reducers
3. make conference reducer names more descriptive
4. add error handling for `body === 'undefined'`

Thanks @rschamp for all the help!
2016-05-19 16:55:25 -04:00
Matthew Taylor
d69de477a1 Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/conference-schedule
* 'develop' of https://github.com/LLK/scratch-www: (32 commits)
  Lint
  Bundle all locale data
  Don't bundle polyfills
  Set up Raven within init.js
  Prefix privacyPolicy message string
  Exclude minified javascript from linting
  One space more
  Changes "interfacesto" to "interfaces to"
  Remove tag target
  Filter before mapping to avoid returning undefined
  Fix Pass condition for "static" routes
  Spacing2
  Mangling is the default
  Spacing
  Update for typography fixes
  Cherry pick PR #476 into master
  Add invisible spacer to anchored sections
  For Developers
  Lint JSON, expand and simplify lint step
  Fix banned user redirect
  ...

# Conflicts:
#	src/redux/actions.js
#	src/redux/reducer.js
2016-05-19 13:25:36 -04:00
Matthew Taylor
cad75217f0 Add schedule/detail components for conference 2016-05-19 11:34:59 -04:00
Matthew Taylor
b969c4e2ed Split reducers into separate files
Use a model of reducer/action files for each component that has them, and make `reducer.js` be the one that imports and configures all of them. This modeling is based on a few examples I've seen which seemed to work for our current case, but I'm totally fine with splitting actions and reducers into separate directories if we'd like too.
2016-05-19 11:34:28 -04:00
Ray Schamp
219d144be2 Prefix privacyPolicy message string
So that it matches the rest, and is localized. Not sure, but I think this was fallout from de-localizing the Privacy Policy page.
2016-05-17 21:01:49 -04:00
Matthew Taylor
829cb6ff0c Merge pull request #478 from mewtaylor/issue/gh-419
Fix GH-419: Some localization cleanup
2016-05-17 11:43:27 -04:00
Ray Schamp
b7dd55e7e0 Merge branch 'feature/for-developers' into develop 2016-05-17 08:28:25 -04:00
carljbowman
e885c08ea1 For Developers
Add landing page for developers
2016-05-17 07:51:08 -04:00
Matthew Taylor
4abebd8194 Remove duplicate About Scratch entry
Towards #419 – makes "About Scratch" work on the About page. Additionally, removes `defaultMessages` from the footer since we no longer use those.
2016-05-16 10:19:52 -04:00
Matthew Taylor
804a65e3d0 Whoops
That change is coming later with more redux in conference :).
2016-05-12 18:39:33 -04:00
Matthew Taylor
82dbfabcec Constrain view styles to within view name classes
So that they don't affect styles declared outside the scope of the view. Thanks @rschamp!
2016-05-12 18:32:57 -04:00
Matthew Taylor
e1cebe46db Ergonomics – get rid of typography file
1. Merge typography into main
2. Get rid of use of `#view` in scss
3. Make `render` work with conference pages
2016-05-12 18:05:26 -04:00
The_Grits
8d294e4d29 Float 2016-05-11 09:53:39 -04:00
The_Grits
75258be4a4 margin-right
4.4px is the max margin we can put to the right of the button without the "Forgot password?" text wrapping.
2016-05-09 11:27:22 -04:00
Matthew Taylor
87009babae Merge pull request #431 from TheGrits/patch-6
Fix gh-426: Update Project Count
2016-04-29 16:38:02 -04:00
Matthew Taylor
cf71520875 final content update for conference
"coming soon" image for schedule, and schedule reference on landing page. Also background image for the landing page.
2016-04-27 23:23:43 -04:00
Matthew Taylor
7d7fb9797d Cleanup for scratch conference
1. s/collaborators/sponsors
2. open footer links in new window
3. remove superfluous require statement
4. increase spacing for scratch family links
2016-04-26 12:24:55 -04:00
The_Grits
e73d3fabcc All other references 2016-04-22 14:16:59 -04:00
Matthew Taylor
2eb62e8ab3 move component convention back to what it was
formerly presentation components such as `navigation` and `footer` have been nested, and renamed to `container` inside their respective component subdirs
2016-04-21 18:13:21 -04:00
Matthew Taylor
66113e1c58 Add conference sub-site 2016-04-21 16:22:39 -04:00
Matthew Taylor
017d58fb1b Split out footer container/presentation 2016-04-21 16:22:16 -04:00
Matthew Taylor
f05cb39501 Add flex-row component
Just a container with some default flexbox formatting.
2016-04-21 16:21:22 -04:00
Matthew Taylor
eed6f1fc08 Restructure src
1. Put formatting-specific components into the `presentation` subdir of `components`
2. Put content-specific components into the `container` subdir of `components`
3. Put views that are sub-urls of the site into a subdir of `views` (i.e. `microworlds`, and eventually `conference`)
2016-04-21 15:46:32 -04:00
Ray Schamp
c9157e70b9 Fix reference to session
Caused by merging an old branch which didn't have conflicts, but did have a different understanding of session.
2016-03-29 18:38:39 -04:00
Ray Schamp
78649b69e2 Merge pull request #353 from morantsur/feature/microworlds
Moving Microworlds pages to scratch-www & adding arts
2016-03-25 15:43:10 -04:00
Ray Schamp
ea04658b4a Merge pull request #387 from rschamp/feature/scratchr2#2937-student-nav
Add "My Class" to student nav
2016-03-25 14:32:22 -04:00
Ray Schamp
6e0d35efaa Fix incorrect nesting in search styles 2016-03-24 13:12:41 -04:00
Ray Schamp
74d23d05dc Remove inline default messages 2016-03-24 12:29:40 -04:00
Ray Schamp
2d6a38800b Add "My Class" to student nav 2016-03-24 12:28:32 -04:00
Ray Schamp
dce35a4bee Add keys to children where necessary 2016-03-24 11:29:26 -04:00
Ray Schamp
19f469db48 Upgrade and quiet sass-linter
These warnings were annoying me because the noise makes it easy to miss real issues.

The `no-mergeable-selectors` rule is one that we do want to have, but right now it asks that you merge selectors in different `@media` blocks.  When the next release happens we should put that back.

https://github.com/sasstools/sass-lint/issues/307

Similarly, we want `force-element-nesting` but there is a problem with that because there's no easy way to have a nested selector in a list of selectors.
https://github.com/sasstools/sass-lint/issues/575

Finally, until they implement per-line overrides, we have to silence `class-name-format` because we don't have control over the ReactModal class names.  It's a useful rule to keep class names consistent though.  Per-line ignores should be coming soon: https://github.com/sasstools/sass-lint/issues/70
2016-03-23 18:34:54 -04:00
Matthew Taylor
9a2a923b7b Remove projectCount from intro.jsx
thanks @rschamp!
2016-03-22 12:09:51 -04:00