Changeset - d117b5b443eb
[Not reviewed]
Merge
0 7 6
Christopher Neugebauer - 4 years ago 2017-08-13 02:56:30
chrisjrn@gmail.com
Merge branch 'designulate'
5 files changed:
0 comments (0 inline, 0 general)
pinaxcon/templates/_footer.html
Show inline comments
 
<div class="pull-left">
 
    North Bay Python is a member project of the <a href="https://sfconservancy.org" title="Software Freedom Conservancy">Software Freedom Conservancy</a>, a 501(c)(3) charity.<br/>
 
<div class="row">
 
  <div class="pull-left">
 
    North Bay Python is a member project of <a href="https://sfconservancy.org" title="Software Freedom Conservancy">Software Freedom Conservancy</a>, a 501(c)(3) charity.<br/>
 

	
 
    <a href="https://facebook.com/northbaypython" title="North Bay Python on Facebook">Facebook</a> | <a href="https://twitter.com/northbaypython" title="North Bay Python on Twitter">Twitter</a> | <a href="https://lanyrd.com/2017/nbpy" title="North Bay Python on Lanyrd">Lanyrd</a> | <a href="/code-of-conduct" title="North Bay Python Code of Conduct">Code of Conduct</a> | <a href="/terms-and-conditions" title="North Bay Python Terms and Conditions">Terms and Conditions</a> | <a href="/about/colophon" title="North Bay Python Colophon">Colophon</a>
 
</div>
 
  </div>
 

	
 
<div class="pull-right">
 
    Site powered by <a href="https://github.com/chrisjrn/symposion/" title="Symposion Git Repository"><b>Symposion</b></a>
 
    and <a href="https://github.com/chrisjrn/registrasion/" title="Registrasion Git Repository"><b>Registrasion</b></a>.
 
  <div class="pull-right">
 
      Site powered by <a href="https://github.com/chrisjrn/symposion/" title="Symposion Git Repository"><b>Symposion</b></a>
 
      and <a href="https://github.com/chrisjrn/registrasion/" title="Registrasion Git Repository"><b>Registrasion</b></a>.
 
  </div>
 
</div>
pinaxcon/templates/_styles.html
Show inline comments
 
{% load compress %}
 
{% load staticfiles %}
 

	
 
<link href="https://fonts.googleapis.com/css?family=Montserrat:300,500,700" rel="stylesheet">
 
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
 
{% compress css %}
 
    <link rel="stylesheet" type="text/x-scss" href="{% static "scss/site.scss" %}" />
 
{% endcompress %}
pinaxcon/templates/site_base.html
Show inline comments
...
 
@@ -15,12 +15,19 @@
 

	
 
{% block nav %}
 
    {% sitetree_menu from "main" include "trunk" template "sitetree/menu_bootstrap3.html" %}
 
{% endblock %}
 

	
 
{% block body_base %}
 

	
 
  <div class="homepage-block-bg" style="background-image: url('{% static "images/website-background.svg" %}');"></div>
 

	
 
  <div id="background-filter">
 

	
 
  <div class="hills footer"></div>
 

	
 
    <section id="content_body">
 
        <div class="container">
 
            {% include "_messages.html" %}
 
            <div class="row">
 
                <div class="col-md-9">
 
                    {% block body %}
...
 
@@ -34,14 +41,20 @@
 
            </div>
 
        </div>
 
    </section>
 
{% endblock %}
 

	
 

	
 
{% block footer %}
 
    {% include "_footer.html" %}
 
{% block footer_base %}
 
  <div class="container">
 
    <footer>
 
      {% block footer %}
 
          {% include "_footer.html" %}
 
      {% endblock %}
 
    </footer>
 
  </div>
 
{% endblock %}
 

	
 

	
 
{% block scripts %}
 
    {% include "_scripts.html" %}
 
{% endblock %}
pinaxcon/templates/site_base_home.html
Show inline comments
 
new file 100644
 
{% extends "site_base.html" %}
 

	
 

	
 
{% block body_base %}
 
    {% include "_messages.html" %}
 
    {% block body %}
 
    {% endblock %}
 
{% endblock %}
pinaxcon/templates/static_pages/homepage.html
Show inline comments
 
{% extends "site_base.html" %}
 
{% extends "site_base_home.html" %}
 

	
 
{% load i18n %}
 
{% load staticfiles %}
 

	
 
{% block head_title %}Welcome{% endblock %}
 

	
 
{% block body_class %}home{% endblock %}
 

	
 
{% block body %}
 

	
 
  <div class="homepage-block-bg" style="background-image: url('{% static "images/website-background.svg" %}');"></div>
 

	
 
  <div class="jumbotron homepage-block light">
 

	
 
    <div class="homepage-block-bg" style="background-image: url('{% static "images/website-background.svg" %}');"></div>
 

	
 
    <div class="hills main"></div>
 

	
 
    <div class="container homepage-block-content">
 

	
 
      <div class="tight-headings">
 
        <h1>North Bay Python</h1>
 
        <h3>A Python conference north of the Golden Gate</h3>
 
      </div>
 

	
 
      <div class="bottom-align">
 
        <h3>
 
          The Mystic Theatre</br>
 
          Petaluma, California
 
        </h3>
 
        <h4>
 
          <strong>2017 conference:</strong> 2 &amp; 3 December <br/>
 
          Talk submissions close 29 September
 
        </h4>
 

	
 
        <div style="height:0.5em;"></div>
 

	
 
        <div class="btn-group">
 
          <a class="btn btn-lg btn-primary" href="/dashboard">Submit a proposal</a>
 
        </div>
 
      </div>
 

	
 
    </div>
 
  </div>
 

	
 
  <div class="jumbotron homepage-block dark">
 

	
 
    <div class="homepage-block-bg" style="background-image: url('{% static "images/mystic.jpg" %}');"></div>
 

	
 
    <div class="container homepage-block-content">
 
      <h1>Downtown Petaluma</h1>
 

	
 
      <p>Here is some text about Petaluma and the Mystic Theatre. It's pretty great. The mystic is close to restaurants and hotels. Petaluma is only an hour out of San Francisco. Blah.</p>
 

	
 
      <div class="bottom-align" style="width: 100%">
 
        <div class="btn-group col-md-4">
 
          <a class="btn btn-lg btn-primary" href="/about/north-bay-python">Find out more</a>
 
        </div>
 

	
 
        <div class="col-md-8 text-right">
 
          Image credit: <a href="https://www.instagram.com/p/BU-G5dGAkHt">Mystic Theatre</a>, &copy; 2017 Christopher Neugebauer (CC-BY-SA)</div>
 
      </div>
 
  </div>
 

	
 
  </div>
 

	
 
  <div class="jumbotron homepage-block white">
 

	
 
    <div class="container homepage-block-content">
 
      <h1>Sponsors</h1>
 
    </div>
 
  </div>
 

	
 
  <div class="jumbotron homepage-block dark">
 

	
 
    <div class="homepage-block-bg" style="background-image: url('{% static "images/django-girls-2014.jpg" %}');"></div>
 

	
 
    <div class="container homepage-block-content">
 
      <h1>Inclusion and Diversity</h1>
 

	
 
      <p>Statement about commitment to inclusion and diversity. Strong code of conduct. Short and long term diversity targets in our call for proposals. Cheap tickets, with an entry fee that we will waive on request. Financial assistance for those who need it.</p>
 

	
 

	
 
      <div class="bottom-align" style="width: 100%">
 
        <div class="btn-group col-md-4">
 
          <a class="btn btn-lg btn-primary" href="/code-of-conduct">View our code of conduct</a>
 
        </div>
 

	
 
        <div class="col-md-8 text-right">
 
          Image credit: <a href="https://www.flickr.com/photos/richard_jones/14638274749">DjangoGirls Brisbane 2014</a>, &copy; 2014 Richard Jones (CC-BY)</div>
 
      </div>
 
    </div>
 
  </div>
 

	
 
{% endblock %}

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)