Merge branch 'add_sponsors_logos_to_upcoming_event'

Tomasz-Kluczkowski · Tomasz-Kluczkowski · commit bb01dec9e5d7 · 2018-03-02T22:50:02.000Z
diff --git a/_posts/2018-03-10-Pandas-Documentation-Sprint.md b/_posts/2018-03-10-Pandas-Documentation-Sprint.md
@@ -3,16 +3,18 @@ layout: post
 title: Pandas documentation sprint (worldwide)
 project: Pandas
 project_description: Powerful Python data analysis toolkit
+project_logo: static/images/events/pandas_logo_donation.png
+project_link: http://pandas.pydata.org/index.html
 date: 2018-03-10
 venue: Bloomberg (London)
 meetup_link: https://www.meetup.com/Python-Sprints/events/247097848/
 event_link: https://python-sprints.github.io/pandas/
 image: static/images/events/pandas_documentation_sprint_1280_720px.jpg
-project_logo: static/images/events/pandas_logo_donation.png
 
 sponsors: 
     - bloomberg
     - python_software_foundation
+    - numfocus
 ---
 
 Pandas is an open source Python library for data manipulation and analysis. Its popularity is skyrocketing, and it is becoming the de-facto standard for data science and data engineering. But the number of core developers and contributors did not grow as fast as its popularity, and things like the API documentation would benefit from some help.
diff --git a/_sass/style.scss b/_sass/style.scss
@@ -297,22 +297,22 @@ a {
 }
 
 .upcoming__col {
-  margin-top: 1%;
   background: rgba(0, 0, 0, 0.7);
-  border-radius: 20px 5px 20px 5px;
-  box-shadow: black 5px 5px 5px 0;
+  border-radius: 5px;
+  border: #000000 2px ridge;
+  box-shadow: rgba(0, 0, 0, 0.76) 5px 5px 5px 0;
 }
 
 @media (min-width: 768px) {
   .upcoming__col {
-    margin-left: 0.5%;
+    margin-left: 5.5%;
   }
 }
 
-.upcoming-title {
+.upcoming__title {
   font-size: 2.5em;
   color: antiquewhite;
-  text-align: left;
+  text-align: center;
   font-family: 'Encode Sans Expanded', sans-serif;
   margin-top: 2.5%;
   margin-bottom: 2.5%;
@@ -333,43 +333,60 @@ a {
 .upcoming__img-container {
   background-size: cover;
   background-position: center center;
-  border-radius: 20px 5px 20px 5px;
+  border-radius: 20px;
   border-top: #A55605 3px solid;
   border-bottom: #A55605 3px solid;
   min-height: 50vh;
 }
 
-@media (min-width: 768px) {
-  min-height: 60vh;
+.upcoming__content {
+  margin-top: 5.5%;
 }
 
 .upcoming__logo-col {
-  flex: 1;
+  padding-right: 0;
+  padding-left: 0;
+  margin-top: 1em;
+  box-shadow: rgba(0, 0, 0, 0.76) 5px 5px 5px 0;
 }
 
+@media (min-width: 768px) {
+  .upcoming__logo-col {
+    margin-top: 0;
+    margin-right: 5.5%;
+  }
+}
+
+
 .upcoming__project-logo {
-  margin-top: 5%;
+  margin: 0.5em;
   border: #A55605 3px double;
   border-radius: 5px;
   max-width: 50%;
-  ;
 }
 
-@media (min-width: 768px) {
-  .upcoming__project-logo {
-    margin-top: 2.5%;
-    margin-left: 2.5%;
-  }
+.upcoming__sponsor-list {
+  background: rgba(7, 41, 72, 0.7);
+  border: #072948 2px ridge;
+  border-radius: 5px;
+}
+
+.upcoming__sponsor-title {
+  color: antiquewhite;
+  font-family: 'Encode Sans Expanded', sans-serif;
+  font-size: 2.5em;
+  padding-top: 2.5%;
+  margin-bottom: 2.5%;
 }
 
 .upcoming__button-row {
   margin-top: 10%;
-  margin-bottom: 5%;
+  margin-bottom: 5.5%;
 }
 
 @media (min-width: 768px) {
   .upcoming__button-row {
-    margin-top: 5%;
+    margin-top: 5.5%;
   }
 }
 
@@ -388,7 +405,7 @@ a {
   &:hover {
     color: antiquewhite;
     background: rgba(0, 0, 0, 0.4);
-    border: antiquewhite 1px solid;
+    border: #A55605 1px solid;
   }
 }
 
@@ -602,6 +619,8 @@ a {
 
 .footer__sponsor-col {
   text-align: center;
+  padding-left: 0;
+  padding-right: 0;
 }
 
 .footer__icon {
@@ -637,7 +656,7 @@ a {
   display: inline-block;
   line-height: 102px;
   vertical-align: middle;
-  margin: 1%;
+  margin: 0.5em 1% 0.5em 1%;
   width: 75%;
   height: 102px;
   &:hover > .footer__img {
diff --git a/_sponsors/numfocus.md b/_sponsors/numfocus.md
@@ -0,0 +1,8 @@
+---
+sponsor_id: numfocus
+sponsor_name: "NumFOCUS"
+sponsor_logo: static/images/sponsors/numfocus.png
+sponsor_link: https://www.numfocus.org/
+permanent: false
+---
+NumFOCUS is a non-profit based in Austin, Texas. Their mission is to promote high-quality, reproducible scientific research by supporting open source scientific computing and data science projects. They are sponsors for such projects as Pandas, Numpy, Jupyter and many more.
diff --git a/index.html b/index.html
@@ -52,9 +52,9 @@ <h3 class="mission__statement">Provide mentorship and challenge for people of al
         <div class="row container-fluid">
             <hr class="upcoming-divider">
             <div class="upcoming__img-container col-md-12">
-                <div class="row">
-                    <div class="upcoming__col col-md-5 col-12">
-                        <h2 class="upcoming-title">Upcoming Event</h2>
+                <div class="upcoming__content row">
+                    <div class="upcoming__col col-md-5 col-12 mr-auto">
+                        <h2 class="upcoming__title">Upcoming Event</h2>
                         <div class="row">
                             <div class="no-gutters__col col-3">
                                 <h2 class="post__label">Event</h2>
@@ -76,7 +76,6 @@ <h2 class="post__label">Venue</h2>
                                 {{ post.venue }}
                             </div>
                         </div>
-
                         <div class="row">
                             <div class="no-gutters__col col-3">
                                 <h2 class="post__label">Date</h2>
@@ -87,11 +86,72 @@ <h2 class="post__label">Date</h2>
                                 {{ post.date | date: "%e %B %Y" }}
                             </div>
                         </div>
+                        {% if post.project_logo %}
+                            <div class="row">
+                                <div class="no-gutters__col col-3">
+                                    <h2 class="post__label">Project</h2>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="upcoming__event-title col-12 text-center">
+                                    <a href="{{ post.project_link }}">
+                                        <img class="upcoming__project-logo" src="{{ site.baseurl }}/{{ post.project_logo }}">
+                                    </a>
+                                </div>
+                            </div>
+                        {% endif %}
                     </div>
-                    <div class="upcoming__logo-col col-auto text-center">
-                        <a href="http://pandas.pydata.org/index.html">
-                            <img class="upcoming__project-logo" src="{{ site.baseurl }}/{{ post.project_logo }}">
-                        </a>
+                    <div class="upcoming__logo-col col-md-5 text-center">
+                        <div class="upcoming__sponsor-list h-100">
+                            <h2 class="upcoming__sponsor-title">Supported By</h2>
+                            <!--HERE feed event sponsors only - we need sponsor objects not just the name.-->
+                            <!--Build an array of site sponsors (all).-->
+                            {% assign site_sponsors_all = "" | split: ',' %}
+                            {% for sponsor in site.sponsors %}
+                            {% assign site_sponsors_all = site_sponsors_all | push: sponsor %}
+                            {% endfor %}
+
+                            <!--Build an array of sponsors for the event.-->
+                            {% assign event_sponsors = "" | split: ',' %}
+                            {% for sponsor in post.sponsors %}
+                                {% for site_sponsor in site_sponsors_all %}
+                                    {% if site_sponsor.sponsor_id == sponsor %}
+                                        {% assign event_sponsors = event_sponsors | push: site_sponsor %}
+                                    {% endif %}
+                                {% endfor %}
+                            {% endfor %}
+
+                            {% assign num_of_sponsors = event_sponsors | size %}
+                            {% assign sponsors_remainder = num_of_sponsors | modulo: 2 %}
+
+                            {% if sponsors_remainder == 0 %}
+                                {% assign num_of_sponsors_even = true %}
+                                {% assign row_num_modifier = 1 %}
+                            {% else %}
+                                {% assign num_of_sponsors_even = false %}
+                                {% assign row_num_modifier = 0 %}
+                            {% endif %}
+
+                            {% assign num_of_rows = num_of_sponsors | divided_by: 2 | floor | minus: row_num_modifier %}
+                            {% assign items_per_row = 1 %}
+
+                            {% for row in (0..num_of_rows) %}
+                                {% if forloop.last and num_of_sponsors_even == false %}
+                                    {% assign items_per_row = 0 %}
+                                {% endif %}
+                                <div class="row">
+                                    {% for col in (0..items_per_row) %}
+                                        {% assign sponsor_index = row | times: 2 | plus: col %}
+                                        {% assign sponsor = event_sponsors[sponsor_index] %}
+                                        <div class="footer__sponsor-col col-md-12 col-lg-6">
+                                            <a class="footer__sponsor-link" href="{{ sponsor.sponsor_link }}">
+                                                <img class="footer__img" src="{{ site.baseurl }}/{{ sponsor.sponsor_logo }}">
+                                            </a>
+                                        </div>
+                                    {% endfor %}
+                                </div>
+                            {% endfor %}
+                        </div>
                     </div>
                 </div>
                 <div class="upcoming__button-row row">
diff --git a/static/images/sponsors/numfocus.png b/static/images/sponsors/numfocus.png
