Changeset - 0bad605f068e
[Not reviewed]
Merge
0 5 0
Josh Simmons - 4 years ago 2017-08-13 18:16:55
joshuasimmons@google.com
Merge pull request #35 from northbaypython/designulate

More design work
4 files changed with 98 insertions and 33 deletions:
0 comments (0 inline, 0 general)
pinaxcon/templates/_default_sidebar.html
Show inline comments
...
 
@@ -4,26 +4,30 @@
 

	
 
{% sponsor_levels as levels %}
 

	
 
<h4>Sponsors</h4>
 
<h3>Sponsors</h3>
 

	
 
<div class="sponsor-list">
 
    {% for level in levels %}
 
        {% if level.sponsors %}
 
            <h3>{{ level.name }}</h3>
 

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

	
 
          <h4>{{ level.name }}</h4>
 

	
 
          {% for sponsor in level.sponsors %}
 
              <div>
 
                  {% if sponsor.website_logo %}
 
                      <a href="{{ sponsor.external_url }}" title="{{ sponsor.name }}">
 
                            <img src="{% thumbnail sponsor.website_logo '150x90' %}" alt="{{ sponsor.name }}" />
 
                          <img src="{% thumbnail sponsor.website_logo '600x360' %}" alt="{{ sponsor.name }}" style="width: 100%" />
 
                      </a>
 
                  {% else %}
 
                      <a href="{{ sponsor.external_url }}" title="{{ sponsor.name }}">{{ sponsor.name }}</a>
 
                  {% endif %}
 
              </div>
 

	
 
          {% endfor %}
 

	
 
        {% endif %}
 

	
 
    {% endfor %}
 
</div>
 

	
 

	
pinaxcon/templates/_footer.html
Show inline comments
 
<div class="row">
 
  <div class="pull-left">
 
    <p>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.</p>
 
  <div class="col-md-8">
 
    <p>&copy; 2017 North Bay Python. 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.</p>
 

	
 
    <p><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></p>
 
  </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="col-md-4 text-right">
 
      This site is <a href="https://github.com/northbaypython/website">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>.
 
  </div>
 
</div>
pinaxcon/templates/static_pages/homepage.html
Show inline comments
...
 
@@ -24,20 +24,21 @@
 
        <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
 
          <strong>2017 conference:</strong> December 2 &amp; 3 <br/>
 
          Talk submissions close September 29
 
        </h4>
 

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

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

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

	
...
 
@@ -51,15 +52,25 @@
 
    <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>
 
      <p>North Bay Python's home is Petaluma, a shockingly quaint dairy town, nestled on a river at the edge of California's Wine Country.</p>
 

	
 
      <p>We're hosting the conference at the Mystic Theatre, a 1912-era music hall, right in the middle of Historic Downtown Petaluma. There's countless great places to eat right on our doorstep, craft food and drink producers within walking distance, and plenty of places to stay nearby.</p>
 

	
 
      <p>And it's only an hour's drive out of San Francisco (on a good day).</p>
 

	
 
      <div class="bottom-align" style="width: 100%">
 
    </div>
 

	
 
    <div class="homepage-block-footer" style="width: 100%">
 
      <div class="container">
 
        <div class="row">
 
          <div class="btn-group col-md-4">
 
          <a class="btn btn-lg btn-primary" href="/about/north-bay-python">Find out more</a>
 
            <a class="btn btn-lg btn-primary btn-shadow" 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>
 
            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>
 

	
...
 
@@ -69,7 +80,41 @@
 

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

	
 
      {% load sponsorship_tags %}
 
      {% load thumbnail %}
 

	
 
      {% sponsor_levels as levels %}
 

	
 
      <div class="row">
 
      {% for level in levels %}
 
          {% if level.sponsors %}
 
              {% for sponsor in level.sponsors %}
 
                  <div class="col-md-3">
 
                      {% if sponsor.website_logo %}
 
                          <a href="{{ sponsor.external_url }}" title="{{ sponsor.name }}">
 
                              <img src="{% thumbnail sponsor.website_logo '600x360' %}" alt="{{ sponsor.name }}" style="width:100%"/>
 
                          </a>
 
                      {% else %}
 
                          <a href="{{ sponsor.external_url }}" title="{{ sponsor.name }}">{{ sponsor.name }}</a>
 
                      {% endif %}
 
                  </div>
 
              {% endfor %}
 
          {% endif %}
 
      {% endfor %}
 
      </div>
 

	
 

	
 

	
 
    </div>
 

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

	
 
      <div class="btn-group">
 
        <a class="btn btn-lg btn-primary btn-shadow" href="/sponsors">Become a sponsor</a>
 
      </div>
 
    </div>
 

	
 
  </div>
 

	
 
  <div class="jumbotron homepage-block dark">
...
 
@@ -77,14 +122,24 @@
 
    <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>
 
      <p>North Bay Python is proud to be founded on a commitment to inclusion and diversity.</p>
 

	
 
      <p>We value your safety, so we have a strong Code of Conduct and enforcement policy built on the Python Software Foundation's PyCon US policy.</p>
 

	
 
      <div class="bottom-align" style="width: 100%">
 
      <p>We have set diversity targets for our conference program, including short-term and long-term goals for gender balance. We make financial assistance available to speakers.</p>
 

	
 
      <p>We will always have low-cost tickets available, and we will enthusiastically waive ticket costs on request if you need it.</p>
 

	
 
    </div>
 

	
 
    <div class="homepage-block-footer" style="width: 100%">
 
      <div class="container">
 
        <div class="row">
 
          <div class="btn-group col-md-4">
 
          <a class="btn btn-lg btn-primary" href="/code-of-conduct">View our code of conduct</a>
 
            <a class="btn btn-lg btn-primary btn-shadow" href="/code-of-conduct">View our code of conduct</a>
 
          </div>
 

	
 
          <div class="col-md-8 text-right">
...
 
@@ -93,4 +148,6 @@
 
        </div>
 
      </div>
 

	
 
  </div>
 

	
 
{% endblock %}
static/scss/custom.scss
Show inline comments
...
 
@@ -103,26 +103,26 @@ body.auth .panel-heading .panel-title span.pull-right {
 
  box-shadow: 0px 0px 2em $background-filter; //, inset 0px -5px 1em rgba(0, 0, 0, 0.8);
 
}
 

	
 
.homepage-block-content {
 
  position: relative;
 
  height: 100%;
 
}
 

	
 
.bottom-align {
 
  position: absolute;
 
  bottom: 0;
 
}
 
$homepage-block-min-height: 480px;
 

	
 
.homepage-block {
 
  margin-top: 0;
 
  margin-bottom: 0;
 
  min-height: 480px;  // TODO: change
 
  height: 480px;
 
  min-height: $homepage-block-min-height;
 
  position: relative;
 
  box-shadow: $box-shadow;
 
  z-index: 3;
 
}
 

	
 
.homepage-block-content {
 
  min-height: ($homepage-block-min-height - 80px);
 
}
 

	
 
/* ??? */
 
.homepage-block-footer {
 

	
 
}
 

	
 
.homepage-block.light {
 
  background-color: $background-filter;
 
  z-index: 2;
...
 
@@ -150,6 +150,7 @@ body.auth .panel-heading .panel-title span.pull-right {
 
.homepage-block.dark {
 
  background: $gray-base;
 
  color: white;
 
  text-shadow: 1px 1px $gray-dark;
 
}
 

	
 
.navbar {
...
 
@@ -173,6 +174,9 @@ body.auth .panel-heading .panel-title span.pull-right {
 

	
 
}
 

	
 
.btn-shadow {
 
  box-shadow: 1px 1px 5px $gray-dark;
 
}
 

	
 
.hills {
 
  background-size: 100%;
0 comments (0 inline, 0 general)