Changeset - 7fdeb0f81298
[Not reviewed]
Merge
0 2 0
Christopher Neugebauer - 6 years ago 2017-08-31 00:16:22
chrisjrn@gmail.com
Merge branch 'master' into prod
2 files changed with 22 insertions and 2 deletions:
0 comments (0 inline, 0 general)
pinaxcon/templates/static_pages/homepage.html
Show inline comments
...
 
@@ -113,19 +113,21 @@
 

	
 
      <div class="row sponsor-list">
 
      {% for level in levels %}
 
          {% if level.sponsors %}
 
              {% for sponsor in level.sponsors %}
 
                  <div class="sponsor">
 
                    <div class="logo-alignment">
 
                      {% if sponsor.website_logo %}
 
                          <a href="{{ sponsor.external_url }}">
 
                              <img src="{% thumbnail sponsor.website_logo '600x360' %}" alt="{{ sponsor.name }}">
 
                          </a>
 
                      {% else %}
 
                          <a href="{{ sponsor.external_url }}">{{ sponsor.name }}</a>
 
                      {% endif %}
 
                    </div>
 
                  </div>
 
              {% endfor %}
 
          {% endif %}
 
      {% endfor %}
 
      </div>
 
    </div>
static/scss/custom.scss
Show inline comments
...
 
@@ -124,16 +124,36 @@ $homepage-block-min-height: 480px;
 
  min-height: $homepage-block-min-height;
 
  position: relative;
 
  box-shadow: $box-shadow;
 
  z-index: 3;
 

	
 
  .sponsor {
 
    $sponsor-height: 150px;
 
    @include make-xs-column(6);
 
    @include make-sm-column(4);
 
    @include make-md-column(3);
 
    max-width: 600px;
 
    height: $sponsor-height;
 

	
 

	
 
    .logo-alignment {
 
      max-width: 300px;
 
      width: 100%;
 
      height: 100%;
 

	
 
      // Center the icon horizontally and vertically
 
      text-align: center;
 
      line-height: ($sponsor-height - 5px);
 
      vertical-align: middle;
 

	
 
      a img {
 
        max-width: 100%;
 
        max-height: 100%;
 
      }
 
    }
 

	
 
  }
 
}
 

	
 

	
 
.homepage-block-content {
 
  min-height: ($homepage-block-min-height - 80px);
...
 
@@ -278,14 +298,12 @@ $homepage-block-min-height: 480px;
 

	
 
.djangogirls-background {
 
  background-image: url("../images/django-girls-2014.jpg");
 
}
 

	
 
.sponsor-list a img {
 
  width: 100%;
 
  max-width: 300px;
 
}
 

	
 
.sponsor-list {
 
  margin-top: 1em;
 
}
 

	
0 comments (0 inline, 0 general)