Commit graph

565 commits

Author SHA1 Message Date
Sam Kitajima-Kimbrel
8e1b703b66 Add "accessibility" as a potential topic
As suggested by Nic, again!
2017-08-15 10:10:59 -07:00
Sam Kitajima-Kimbrel
52c75ff220 Merge pull request #49 from northbaypython/disability-diversity
Add statement on including people with disabilities
2017-08-15 10:03:48 -07:00
Sam Kitajima-Kimbrel
ac9edb275b Add statement on including people with disabilities 2017-08-15 09:42:21 -07:00
Joshua Simmons
c71011d6b3 *backs away slowly* correct overzealous css selector 2017-08-14 19:20:07 -07:00
Josh Simmons
b18356ab87 Merge pull request #48 from northbaypython/josh/copy
GRUMBLE
2017-08-15 11:55:41 +10:00
Joshua Simmons
996c3f96e5 Merge branch 'josh/copy' of github.com:northbaypython/website into josh/copy 2017-08-14 18:54:47 -07:00
Joshua Simmons
b51c47fccf you have got to be fucking kidding me 2017-08-14 18:53:08 -07:00
Christopher Neugebauer
4fbf225e96 Merge pull request #47 from northbaypython/josh/copy
make links in body copy look like links
2017-08-14 18:52:02 -07:00
Christopher Neugebauer
5f6abc07d5 Merge branch 'master' into josh/copy 2017-08-14 18:51:27 -07:00
Joshua Simmons
2f6819e340 make links in body copy look like links 2017-08-14 18:41:40 -07:00
Josh Simmons
eb0fb26244 Merge pull request #45 from northbaypython/josh/copy
colophon and attribution updates for license compliance
2017-08-15 11:29:09 +10:00
Joshua Simmons
8cec102508 omg my editorial fu is growing weak 2017-08-14 18:27:36 -07:00
Joshua Simmons
ce809fa484 missed a word, oops 2017-08-14 18:26:57 -07:00
Joshua Simmons
bca3a5f4ec proper attribution for terms and conditions* 2017-08-14 18:24:38 -07:00
Joshua Simmons
3539b2dbfb photo attribution 2017-08-14 18:16:27 -07:00
Joshua Simmons
9ed185d314 no emoji were used in the creation of this website 2017-08-14 17:55:42 -07:00
Christopher Neugebauer
7668acceb6 Merge pull request #44 from northbaypython/josh/copy
add contact info for code of conduct
2017-08-14 17:54:02 -07:00
Joshua Simmons
f80aea208d oops, missed a quotation mark 2017-08-14 17:50:42 -07:00
Joshua Simmons
a4a07cf6a7 add contact info for code of conduct 2017-08-14 16:06:47 -07:00
Josh Simmons
5bfb2f334b Merge pull request #43 from northbaypython/designulate
More words and such
2017-08-15 08:40:10 +10:00
Christopher Neugebauer
88ef9e913b More about-us copy tidied up; adds a bit about prices 2017-08-14 15:37:33 -07:00
Christopher Neugebauer
4a371cd979 Missed a thing 2017-08-14 15:15:07 -07:00
Christopher Neugebauer
33e29a1b97 Made changes requested in review 2017-08-14 15:13:30 -07:00
Christopher Neugebauer
d285c4c968 more line breaks 2017-08-14 14:26:31 -07:00
Christopher Neugebauer
62be64504a line brakes 2017-08-14 14:25:10 -07:00
Christopher Neugebauer
5ef70cc599 Homepage/about stuff 2017-08-14 14:19:31 -07:00
Christopher Neugebauer
dbdbdac6d8 Adds sponsorship page 2017-08-14 12:34:53 -07:00
Joshua Simmons
dab4bb7e94 Merge branch 'master' of github.com:northbaypython/website 2017-08-14 10:07:00 -07:00
Joshua Simmons
d2f394ee78 add office hours schedule to cfp page 2017-08-14 10:06:41 -07:00
Christopher Neugebauer
89e9e98db2 Reverts runtime.txt 2017-08-14 09:25:47 -07:00
Joshua Simmons
8b3301e5c0 Merge branch 'master' of github.com:northbaypython/website 2017-08-14 09:11:33 -07:00
Christopher Neugebauer
9fa88f7c1c Update runtime.txt
(UNDO THIS MOMENTARILY TO FIX HEROKU)
2017-08-14 09:07:25 -07:00
Christopher Neugebauer
c35f121132 Update base.txt
fix fix
2017-08-14 09:02:49 -07:00
Christopher Neugebauer
8a4039b0ec Merge pull request #36 from northbaypython/cfp
CFP forms updated
2017-08-14 08:59:46 -07:00
Joshua Simmons
d7219ab153 fix contrast of links on dark jumbotrons, remove lanyrd from footer (oops) 2017-08-13 23:01:39 -07:00
Josh Simmons
2d4e072e66 Merge pull request #42 from northbaypython/josh/copy
fixing metatags >.<
2017-08-13 22:23:30 -07:00
Andrew Godwin
6265b747c4 Some text about the conference. 2017-08-13 22:12:37 -07:00
Joshua Simmons
f9e018b9a4 fix twitter metatag... or rather, don't reuse head_title block -_- 2017-08-13 20:58:35 -07:00
Joshua Simmons
9ae5bc9691 twitter metatags 2017-08-13 20:54:20 -07:00
Christopher Neugebauer
b17c1c1d57 Merge pull request #41 from northbaypython/josh/copy
metatag stuff
2017-08-13 20:48:38 -07:00
Joshua Simmons
40024cbeeb moar metatags 2017-08-13 20:47:05 -07:00
Josh Simmons
25f41d832a Merge pull request #40 from northbaypython/designulate
More design stuff
2017-08-13 20:46:30 -07:00
Christopher Neugebauer
741a325b91 Merge remote-tracking branch 'origin/master' into designulate 2017-08-13 20:44:01 -07:00
Christopher Neugebauer
27080b4e35 Sponsor page touchups; fixes responsiveness on the logo 2017-08-13 20:42:24 -07:00
Christopher Neugebauer
6c21596d55 Adds social media and newsletter bits 2017-08-13 20:29:44 -07:00
Joshua Simmons
4a1d87c993 fix issues with og metatags 2017-08-13 20:05:01 -07:00
Josh Simmons
6b057ca26e Merge pull request #39 from northbaypython/josh/copy
first attempt at opengraph metatags
2017-08-13 18:54:25 -07:00
Joshua Simmons
f8bb63a738 first attempt at opengraph metatags 2017-08-13 18:53:12 -07:00
Christopher Neugebauer
3324a71649 Merge pull request #38 from northbaypython/josh/copy
add and refine copy, add prospectus links, refine code, add favicon
2017-08-13 18:43:24 -07:00
Joshua Simmons
d33c0a6523 broke a long ass sentence in two 2017-08-13 18:39:50 -07:00