From 3a361be67b204672f93eff6bfc1eaa410a945006 2017-08-18 19:34:18
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: 2017-08-18 19:34:18
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into prod

---

diff --git a/pinaxcon/templates/static_pages/about/team.html b/pinaxcon/templates/static_pages/about/team.html
index 1bd7a6d240a68ba5efd37794f864023ae8e15296..9b0cf264b9ee74f7d9f484f07591de29e16663d2 100644
--- a/pinaxcon/templates/static_pages/about/team.html
+++ b/pinaxcon/templates/static_pages/about/team.html
@@ -56,7 +56,7 @@ Our team of North Bay and Bay Area locals has years of experience building commu
 <ul>
   <li><a href="https://twitter.com/vavroom">Nicolas Steenhout</a> is helping us with accessibility and inclusion of people with disabilities.</li>
   <li><a href="https://twitter.com/vmbrasseur">VM (Vicky) Brasseur</a> is helping us run an excellent call for proposals, design our office hours program, and support new speakers with speaker training.</li>
-  <li><a href="https://twitter.com/sigje">Jen Davis</a> is helping us make the event accessible to parents by advising on things like childcare.</li>
+  <li><a href="https://twitter.com/sigje">Jennifer Davis</a> is helping us make the event accessible to parents by advising on things like childcare.</li>
 </ul>
 
 
diff --git a/static/scss/custom.scss b/static/scss/custom.scss
index 71e33f68f4687360b624a724822018d6ef441173..b61ca7cb9741e6e5903e51969d7fce624e0f91e0 100644
--- a/static/scss/custom.scss
+++ b/static/scss/custom.scss
@@ -391,3 +391,7 @@ footer .footer-copy {
   background-color: $gray-lighter;
   font-size: 10px;
 }
+
+body.login #content_body .row > div.col-md-9 > p + div.container {
+  padding-left: 0px;
+}