Quincy Larson 7279559c41 Merge branch 'staging' into nonprofit-improvements ...

Conflicts:
	controllers/resources.js
	seed_data/bonfires.json
	views/partials/navbar.jade

2015-05-22 19:36:15 -07:00

..

css-cdns.jade

get closer to all bower static assets

2015-05-03 01:37:22 -07:00

field-guide.jade

hotfixes for field guide

2015-05-09 23:40:28 -07:00

flash.jade

improve the footer

2015-04-07 00:11:31 -07:00

footer.jade

Github => GitHub

2015-05-20 16:29:05 +02:00

github.jade

Revert from tight-h3 class to prevent text overlapping when the text wrapped on devices with lower resolution

2015-02-27 18:17:42 +09:00

meta.jade

update the meta image files for our new curriculum

2015-04-21 19:38:13 -07:00

navbar.jade

add jobs page

2015-05-22 19:30:56 -07:00

nonprofit-application-progress-bar.jade

get seed data seeding and improve application submitted button

2015-04-08 14:57:08 -07:00

nonprofits.jade

got show all nonprofits button working and improved nonprofit show view

2015-03-31 17:38:33 -07:00

universal-head.jade

Update views for new variable names. Get profile view working. Update challenge map.

2015-05-20 21:50:31 -04:00