The_Grits
f3fafb7b3a
Rename and Update
2016-05-26 11:31:16 -04:00
The_Grits
9bd63bd11a
Spacing
2016-05-26 11:23:17 -04:00
The_Grits
7948c8bbc4
Hello Travis
2016-05-24 10:21:19 -04:00
The_Grits
ac96ffc6f6
Squash and Merge
2016-05-24 10:05:17 -04:00
Ray Schamp
bb0ac87aec
Merge pull request #488 from TheGrits/patch-1
...
[Privacy Policy] One space more
2016-05-17 16:26:50 -04:00
Ray Schamp
dff9c3d128
Merge pull request #489 from technoboy10/patch-3
...
Hotfix: Resolve gh-484 (cosmetic issue in developers page)
2016-05-17 16:24:17 -04:00
The_Grits
2d80c46c74
One space more
...
I can't believe I missed this one earlier. *facepalm*
2016-05-17 15:46:20 -04:00
Connor Hudson
9808a31d9a
Changes "interfacesto" to "interfaces to"
2016-05-17 13:07:19 -06:00
Ray Schamp
0ede616f44
Merge pull request #481 from TheGrits/patch-2
...
Fix Spacing Issues on Privacy Policy
2016-05-17 11:03:11 -04:00
The_Grits
792a5c9622
Spacing2
...
Changed as per @rschamp's comments
2016-05-17 11:02:34 -04:00
The_Grits
834f2db463
Spacing
...
I noticed some spacing issues on the page, I thought I would fix them.
2016-05-17 09:52:42 -04:00
Ray Schamp
6b420b4445
Update for typography fixes
2016-05-17 08:30:27 -04:00
Ray Schamp
b7dd55e7e0
Merge branch 'feature/for-developers' into develop
2016-05-17 08:28:25 -04:00
Matthew Taylor
89c2f2628e
Add invisible spacer to anchored sections
...
so that the headers are visible
2016-05-17 08:24:03 -04:00
carljbowman
e885c08ea1
For Developers
...
Add landing page for developers
2016-05-17 07:51:08 -04:00
The_Grits
76c003d854
Lint fixes
2016-05-16 06:45:06 -04:00
The_Grits
5d05d19566
aha
...
Does this fix the lint error?
2016-05-14 23:21:10 -04:00
The_Grits
c2fca9c4c6
Squash and Merge
2016-05-14 22:39:40 -04:00
Matthew Taylor
bf1b3f894d
Some leftovers
...
Thanks @rschamp again!
2016-05-12 22:54:07 -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
Matthew Taylor
fd1016059b
Merge branch 'patch-8' of https://github.com/TheGrits/scratch-www into TheGrits-patch-8
...
* 'patch-8' of https://github.com/TheGrits/scratch-www :
Indent p element
Edit spacing
Whoops
Squash and Merge
Add DMCA route
# Conflicts:
# src/routes.json
2016-05-03 10:23:34 -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
07bbc38822
Merge pull request #433 from TheGrits/patch-7
...
Fix gh-19: Migrate Community Guidelines
2016-04-29 17:32:35 -04:00
The_Grits
20dcf8eb4f
switch
2016-04-29 17:27:39 -04:00
The_Grits
64143704d5
Thanks Travis
...
Got rid of a trailing space
2016-04-29 17:22:49 -04:00
The_Grits
aaf4ee5b49
oops lol
...
Gotta love those duplicate lines!
2016-04-29 17:18:09 -04:00
The_Grits
09775ad4a5
Squash and Merge
2016-04-29 17:15:26 -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
The_Grits
9ae31c132f
Indent p element
2016-04-28 09:18:26 -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
df8c036daf
Edit spacing
...
As per @mewtaylor 's suggestions on #435
2016-04-26 09:09:07 -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
c657a4b5f9
Squash and Merge
2016-04-25 07:52:20 -04:00
The_Grits
117eed5eb3
Squash and Merge
2016-04-23 14:27:08 -04:00
The_Grits
e73d3fabcc
All other references
2016-04-22 14:16:59 -04:00
The_Grits
123b366180
13mil -> 14mil
2016-04-22 14:11:25 -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
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
3c8a7db834
Take margins out of typography
...
They won't be the same margins for text-heavy and text-lite pages, so we should make thess view-specific for now
2016-04-21 16:19:20 -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
Matthew Taylor
a6e199b5f4
Merge pull request #414 from TheGrits/patch-4
...
Fix gh-413: Update supporting organizations
2016-04-15 16:22:54 -04:00
The_Grits
c9492ae38b
Update l10n.json
2016-04-15 16:12:17 -04:00
The_Grits
08ccaa7721
Spaces and Intel
2016-04-15 15:59:32 -04:00
The_Grits
1a2e30fccd
mailto anchor
2016-04-15 15:58:11 -04:00
The_Grits
d6b08a0bff
Add Chris and Julia
...
As per https://github.com/LLK/scratch-www/issues/413#issuecomment-209889924
2016-04-14 12:36:20 -04:00
