Changeset - 57c104063a7b
[Not reviewed]
Merge
0 2 1
Christopher Neugebauer - 3 years ago 2017-10-16 02:05:47
chrisjrn@gmail.com
Merge branch 'master' into prod
3 files changed with 76 insertions and 3 deletions:
0 comments (0 inline, 0 general)
pinaxcon/templates/static_pages/homepage.html
Show inline comments
...
 
@@ -2,6 +2,9 @@
 

	
 
{% load i18n %}
 
{% load staticfiles %}
 
{% load thumbnail %}
 
{% load sponsorship_tags %}
 
{% load schedule_tags %}
 

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

	
...
 
@@ -71,6 +74,57 @@
 
    </div>
 
  </div>
 

	
 
  <div class="jumbotron homepage-block white">
 
    <div class="container homepage-block-content">
 
      <h1>Speakers</h1>
 

	
 
      <div class="row speaker-list">
 
        <div class="speaker" >
 
          <div class="image-alignment">
 
            <div class="circle" style="border: 0;">
 
                <div class="fill" style="background-image: url('{% static "images/cczona.jpg" %}');"></div>
 
            </div>
 
          </div>
 

	
 
          <h4>Carina C. Zona</h4>
 
          <span class="presentation-title">Keynote Speaker</span>
 
        </div>
 

	
 
        {% speakers as speakers %}
 
        {% for speaker in speakers %}
 
          <div class="speaker" >
 
            <div class="image-alignment">
 
              <div class="circle" style="border: 0;">
 
                {% if speaker.photo %}
 
                  <div class="fill" style="background-image: url('{% thumbnail speaker.photo '600x600' %}');"></div>
 
                {% else %}
 
                  <div class="fill" style="background-image: url('{% static "images/website-background.svg" %}');"></div>
 
                {% endif %}
 
              </div>
 
            </div>
 
            {% for presentation in speaker.presentations.all %}
 
              <a href="{% url "schedule_presentation_detail" presentation.id %}">
 
              <h4>{{ speaker.conferencespeaker.name }}</h4>
 
                <span class="presentation-title">{{ presentation.title }}</span>
 
              </a>
 
            {% endfor %}
 
          </div>
 
        {% endfor %}
 
      </div>
 
    </div>
 

	
 
    <div class="homepage-block-footer full-width">
 
      <div class="container">
 
        <div class="row">
 
          <div class="col-md-4">
 
            <a class="btn btn-lg btn-primary btn-shadow" href="/schedule/general-sessions/list">See our full program</a>
 
          </div>
 
        </div>
 
      </div>
 
    </div>
 
  </div>
 

	
 

	
 
  <div class="jumbotron homepage-block dark">
 
    <div class="homepage-block-bg mystic-background"></div>
 
    <div class="container homepage-block-content">
...
 
@@ -108,9 +162,6 @@
 
    <div class="container homepage-block-content">
 
      <h1>Sponsors</h1>
 

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

	
 
      {% sponsor_levels as levels %}
 

	
 
      <div class="row sponsor-list">
static/images/cczona.jpg
Show inline comments
 
new file 100644
 
binary diff not shown
Show images
static/scss/custom.scss
Show inline comments
...
 
@@ -154,6 +154,28 @@ $homepage-block-min-height: 480px;
 
    }
 

	
 
  }
 

	
 
  .speaker {
 
    @include make-xs-column(6);
 
    @include make-sm-column(4);
 
    @include make-md-column(3);
 
    max-width: 600px;
 
    min-height: 22em;
 
    margin-bottom: 2em;
 
    text-align: center;
 
    vertical-align: middle;
 

	
 
    .image-alignment {
 
      width: 80%;
 
      height: 80%;
 
      margin: auto auto;
 
      // Center the icon horizontally and vertically
 
    }
 
  }
 

	
 
  .speaker-list {
 
    margin-top: 2em;
 
  }
 
}
 

	
 

	
0 comments (0 inline, 0 general)