diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index 07550d6..a05b171 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -1,13 +1,13 @@ {% load staticfiles %} <div class="row"> - <div class="col-xs-1 col-md-1" > + <div class="logo"> <div class="circle"> <div class="fill" style="background-image: url('{% static "images/logo.svg" %}');"></div> </div> </div> - <div class="col-xs-12 col-md-7"> + <div class="footer-copy"> <p>© 2017 North Bay Python, a member project of <a href="https://sfconservancy.org" title="Software Freedom Conservancy">Software Freedom Conservancy</a>, a 501(c)(3) charity.</p> <p> @@ -15,10 +15,7 @@ | <a href="https://twitter.com/northbaypython" title="North Bay Python on Twitter">Twitter</a> | <a href="/code-of-conduct" title="North Bay Python Code of Conduct">Code of Conduct</a> | <a href="/about/colophon" title="North Bay Python Colophon">Colophon</a></p> - </div> - <div class="col-xs 12 col-md-4 text-right"> - This site is <a href="https://github.com/northbaypython/website" title="North Bay Python Website Git Repository">free and open source software</a>, powered by <a href="https://github.com/chrisjrn/symposion/" title="Symposion Git Repository">Symposion</a> - and <a href="https://github.com/chrisjrn/registrasion/" title="Registrasion Git Repository">Registrasion</a>. + <p>This site is <a href="https://github.com/northbaypython/website" title="North Bay Python Website Git Repository">free and open source software</a>, powered by <a href="https://github.com/chrisjrn/symposion/" title="Symposion Git Repository">Symposion</a> and <a href="https://github.com/chrisjrn/registrasion/" title="Registrasion Git Repository">Registrasion</a>.</p> </div> </div> diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index c6a2046..45f9164 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -27,14 +27,14 @@ </h3> <h4> - <strong>2017 conference:</strong> December 2 & 3 <br/> + December 2 & 3, 2017<br/> Talk submissions open August 21 </h4> </div> - <div class="col-md-4 col-md-offset-2"> + <div class="col-md-4 col-md-offset-2 email-signup-panel"> <div class="panel panel-default"> <div class="panel-heading"> - <h2 class="panel-title">Sign up for our low-volume announcements newsletter</h4> + <h2 class="panel-title">Sign up for our low-volume announcements newsletter!</h4> </div> <div class="panel-body"> <form @@ -93,7 +93,7 @@ <a class="btn btn-lg btn-primary btn-shadow" href="/about/north-bay-python" title="About North Bay Python">Learn More</a> </div> - <div class="col-md-8 text-right"> + <div class="col-md-8 text-right photo-attribution"> Image credit: <a href="https://www.instagram.com/p/BU-G5dGAkHt" title="Photo of the Mystic Theatre">Mystic Theatre</a>, © 2017 Christopher Neugebauer (<a href="https://creativecommons.org/licenses/by-sa/2.0/" title="Creative Commons Attribute Share Alike 2.0 Generic License">CC BY-SA 2.0</a>) </div> </div> @@ -158,7 +158,7 @@ <a class="btn btn-lg btn-primary btn-shadow" href="/code-of-conduct" title"North Bay Python Code of Conduct">Read the Code of Conduct</a> </div> - <div class="col-md-8 text-right"> + <div class="col-md-8 text-right photo-attribution"> Image credit: <a href="https://www.flickr.com/photos/richard_jones/14638274749" title="Photo from DjangoGirls Brisbane 2014">DjangoGirls Brisbane</a>, © 2014 Richard Jones (<a href="https://creativecommons.org/licenses/by/2.0/" title="Creative Commons Attribute 2.0 Generic License">CC BY 2.0</a>) </div> </div> diff --git a/static/scss/custom.scss b/static/scss/custom.scss index 4611c4d..8af8325 100644 --- a/static/scss/custom.scss +++ b/static/scss/custom.scss @@ -303,3 +303,62 @@ body:not(.home) { span.date { font-weight: 900; } + +.email-signup-panel { + max-width: 600px; +} + +.logo { + float: right !important; + width: 80px; + height: 80px; + margin: 0 1em 2em 2em; + + .circle { + width: 80px; + height: 80px; + } +} + +footer .footer-copy { + margin-left: 1em; +} + +@media (max-width: 1200px) and (min-width: 992px) { + .email-signup-panel input.btn { + margin-top: 1em; + } +} + +@media (max-width: 992px) { + .photo-attribution { + margin-top: 1em; + text-align: left; + } + + .email-signup-panel { + margin-top: 2em; + } +} + +@media (max-width: 768px) { + .navbar-nav.pull-right { + float: left !important; + } +} + +@media (max-width: 550px) { + +} + +@media (min-width: 992px) { + .email-signup-panel { + margin-top: 22px; + } +} + +/*mobile issues remain with: + +- navbar + +*/ \ No newline at end of file