Merge branch 'master' into prod

pinaxcon/templates/static_pages/homepage.html

@@ -116,6 +116,7 @@
           {% 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 }}">
@@ -123,6 +124,7 @@
                       {% else %}
                           <a href="{{ sponsor.external_url }}">{{ sponsor.name }}</a>
                       {% endif %}
+                    </div>
                   </div>
               {% endfor %}
           {% endif %}

static/scss/custom.scss

@@ -127,10 +127,30 @@ $homepage-block-min-height: 480px;
   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%;
+      }
+    }
+
   }
 }
 
@@ -281,8 +301,6 @@ $homepage-block-min-height: 480px;
 }
 
 .sponsor-list a img {
-  width: 100%;
-  max-width: 300px;
 }
 
 .sponsor-list {