scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-13 01:01:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1473 commits 220 branches 1 tag 508 MiB
Commit graph

40 commits

Author SHA1 Message Date
The_Grits
2b2f4a03e8 Fix lint 2016-09-13 11:49:34 -04:00
The_Grits
68d37e0506 Update Video Link 
As per @sleggss on #918
 2016-09-13 11:41:39 -04:00
St19_Galla
2123fc9af8 Updates 2016-08-22 11:04:31 -04:00
Matthew Taylor
85377193a8 Merge pull request #796 from mewtaylor/isseu/gh-792 
[Develop] Hotfix: Create space between paragraph elements
 2016-08-02 09:37:27 -04:00
Matthew Taylor
2e962c7831 Create space between paragraph elements 
Fixes #792
 2016-08-01 14:21:27 -04:00
Matthew Taylor
00e6ad2ee1 Add hyperlink to keynote livstream for 2016 conf 2016-08-01 10:59:27 -04:00
Matthew Taylor
c5f85022f3 Copy edits for conference site 2016-06-28 07:51:49 -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
Matthew Taylor
fb4464d0d4 Correction for Nichole Pinkard's name on /expect 
Apologies for the copy error!
 2016-06-06 08:32:48 -04:00
Matthew Taylor
932dab40c7 Some additional mobile changes 2016-05-29 11:59:53 -04:00
Matthew Taylor
ad1e723188 Drop the text below the button 
thanks @carljbowman!
 2016-05-27 16:35:23 -04:00
Matthew Taylor
011032308c Consolidate text 
thanks @carljbowman !
 2016-05-27 16:19:51 -04:00
Matthew Taylor
74ac6e52bb conference formatting tweaks for mobile 
thanks @carljbowman!
 2016-05-27 15:55:27 -04:00
Matthew Taylor
b07b61c925 Update conference to reflect being sold out 2016-05-27 15:55:08 -04:00
Connor Hudson
a4f15f4ec8 Merge pull request #510 from technoboy10/gh507-scheduleanchor 
Fix gh-507: Consistently change URI
 2016-05-26 16:59:44 -04:00
Connor Hudson
e73b26b686 fix spacing issues 
Fixes Travis testing
 2016-05-23 15:35:05 -04:00
Technoboy10
a3fda6be30 use single quotes to appease travis 2016-05-23 14:28:34 -04:00
Technoboy10
6bddc8d2d3 replace anchor when schedule day clicked 2016-05-23 14:10:09 -04:00
Technoboy10
0b6b81e1f1 Merge branch 'release/2.2.9' of https://github.com/llk/scratch-www into release/2.2.9 2016-05-23 10:48:29 -04:00
Technoboy10
b020964ef4 add media query to center links 2016-05-23 10:48:11 -04:00
Technoboy10
7bb9c622c7 set time headers to correct color 2016-05-23 10:10:31 -04:00
Matthew Taylor
a477be4814 Some more cleanup 
1. typo with splitting token/session out
2. redefine `chunk` as `timeSlot`
3. move timeSlot sorting into its own method
 2016-05-19 17:37:51 -04:00
Matthew Taylor
337b6dcfca fix lint warnings 2016-05-19 17:02:21 -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
bca90bd835 Add icons for schedule/details 
from @carljbowman
 2016-05-19 16:40:30 -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
4017266327 Fix typo 2016-05-19 11:26:11 -04:00
Matthew Taylor
bf1b3f894d Some leftovers 
Thanks @rschamp again!
 2016-05-12 22:54:07 -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
Matthew Taylor
47d7257895 Merge pull request #462 from mewtaylor/hotfix/add-register-faq 
[Develop] Hotfix: Add Registration to FAQ
 2016-05-01 12:48:41 -04:00
Matthew Taylor
c28f90857b Add registration faq question 2016-04-29 17:37:41 -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
Matthew Taylor
a4e19a5edc Temporarily remove "View Full Schedule" link 
Since we don't have one yet
 2016-04-25 17:39:31 -04:00
The_Grits
e73d3fabcc All other references 2016-04-22 14:16:59 -04:00
Matthew Taylor
3c487163a0 Last minute copy updates 2016-04-22 09:07:32 -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