Merge remote-tracking branch 'upstream/master'

interim merge for commit (hooking up contact form)
This commit is contained in:
Madeleine Shang 2017-02-05 22:46:26 +00:00
commit 15aeb408c6
8 changed files with 3 additions and 3 deletions

View file

@ -22,7 +22,7 @@
<li class="nav__item"><a href="{{ basenav }}/community/" class="nav__link">{% t nav.community %}</a></li>
<li class="nav__item"><a href="{{ basenav }}/team" class="nav__link">{% t nav.team %}</a></li>
<li class="nav__item"><a href="{{ basenav }}/blog/" class="nav__link">{% t nav.blog %}</a></li>
<li class="nav__item"><a href="{{ basenav }}/evolution/" class="nav__link">{% t nav.evolution %}</a></li>
{% if page.layout != 'post' %}
<li class="nav__item nav__item--languages">
<a href="#" class="nav__link" style="text-transform:uppercase;"><span class="flag {% if 'en' == site.lang %}gb{% else %}{{site.lang}}{% endif %}"></span></a>