merge from afreer

This commit is contained in:
Perry Woodin 2016-11-14 20:09:54 -05:00
parent 0e5c6d7238
commit 1da3f43370
41 changed files with 302 additions and 85 deletions

View file

@ -44,7 +44,8 @@
{% t nav.project %}
<ul>
<li><a href="https://www.dash.org/forum/categories/dash-support.61/" target="_blank">{% t nav.help %}</a></li>
<li><a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=1146914" target="_blank">{% t nav.info %}</a></li>
<li><a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=1146914" target="_blank">{% t nav.info %}</a></li>
<li><a href="https://dashpay.atlassian.net/wiki/" target="_blank">{% t nav.wiki %}</a></li>
<li><a href="{{ basenav }}/team/">{% t nav.team %}</a></li>
<li><a href="https://www.dashfoundation.io/" target="_blank">{% t nav.foundation %}</a></li>
<li><a href="{{ basenav }}/team/">{% t nav.contact %}</a></li>

View file

@ -1,6 +1,6 @@
<div class="hero" id="hero">
<div class="hero__background">
{% srcset hero/currency.jpg ppi:1,2 class="hero__background-image" %}
{% srcset hero/participate.jpg ppi:1,2 class="hero__background-image" %}
{% srcset_source width:1920 %}
{% srcset_source width:960 %}
{% endsrcset %}
@ -20,6 +20,7 @@
<a href="#section-governance" class="btn-white-solid">{% t pages.currency.hero-governance-btn %}</a>
<a href="#section-network" class="btn-white-solid">{% t pages.currency.hero-network-btn %}</a>
<a href="#section-blockchain" class="btn-white-solid">{% t pages.currency.hero-blockchain-btn %}</a>
<a href="#section-mining" class="btn-white-solid">{% t pages.currency.hero-mining-btn %}</a>
</div>
</div>

View file

@ -1,6 +1,6 @@
<div class="hero" id="hero">
<div class="hero__background">
{% srcset home/stock-photo-90982809-the-monthly-finances.jpg ppi:1,2 class="hero__background-image" %}
{% srcset hero/home.jpg ppi:1,2 class="hero__background-image" %}
{% srcset_source width:1920 %}
{% srcset_source width:1280 %}
{% srcset_source width:1024 %}

View file

@ -13,9 +13,9 @@
<div class="hero__buttons">
<a href="{% t pages.team.core-proposal-link %}" class="btn-white-solid">{% t pages.team.core-proposal-btn %}</a>
<a href="{% t pages.team.core-approval-link %}" class="btn-white-solid">{% t pages.team.core-approval-btn %}</a>
<a href="{% t pages.team.core-proposal-link %}" target="_blank" class="btn-white-solid">{% t pages.team.core-proposal-btn %}</a>
<a href="{% t pages.team.core-approval-link %}" target="_blank" class="btn-white-solid">{% t pages.team.core-approval-btn %}</a>
<a href="{{ basenav }}/contact/" class="btn-white-solid">{% t pages.team.core-join-btn %}</a>
</div>
</div>
<!-- Hero stripe -->

View file

@ -14,7 +14,8 @@
<div class="member__name" data-mh="member-name">{{ member.name }}</div>
<div class="member__title" data-mh="member-title">{{ member.title }}</div>
<div class="member__description">{{ member.description }}</div>
<div class="member__description"></div>
{% if member.email %}
<div class="member__detail member__detail--email"><a href="mailto:{{ member.email }}">{{ member.email }}</a></div>

View file

@ -19,8 +19,8 @@
<li class="nav__item"><a href="{{ basenav }}/" class="nav__link">{% t nav.what-is-dash %}</a></li>
<li class="nav__item"><a href="{{ basenav }}/get-dash/" class="nav__link">{% t nav.get-dash %}</a></li>
<li class="nav__item"><a href="{{ basenav }}/merchants/" class="nav__link">{% t nav.merchants %}</a></li>
<li class="nav__item"><a href="{{ basenav }}/participate/" class="nav__link">{% t nav.participate %}</a></li>
<li class="nav__item"><a href="{{ basenav }}/currency/" class="nav__link">{% t nav.currency %}</a></li>
<li class="nav__item"><a href="{{ basenav }}/currency/" class="nav__link">{% t nav.currency %}</a></li>
<li class="nav__item"><a href="{{ basenav }}/participate/" class="nav__link">{% t nav.participate %}</a></li>
<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>

View file

@ -7,9 +7,9 @@
<li class="overlay-menu__item"><a href="{{ basenav }}/" class="overlay-menu__link">{% t nav.what-is-dash %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/get-dash/" class="overlay-menu__link">{% t nav.get-dash %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/merchants/" class="overlay-menu__link">{% t nav.merchants %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/participate/" class="overlay-menu__link">{% t nav.participate %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/currency/" class="overlay-menu__link">{% t nav.currency %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/community/" class="overlay-menu__link">{% t nav.community %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/currency/" class="overlay-menu__link">{% t nav.currency %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/participate/" class="overlay-menu__link">{% t nav.participate %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/community/" class="overlay-menu__link">{% t nav.community %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/team" class="overlay-menu__link">{% t nav.team %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/blog/" class="overlay-menu__link">{% t nav.blog %}</a></li>