joshua/dash-website
1
0
Fork 0
mirror of https://github.com/seigler/dash-website synced 2025-07-27 07:16:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
final merge before PR
This commit is contained in:
Madeleine Shang 2017-02-06 01:42:30 +00:00
commit ace9a7702d
9 changed files with 170 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

2
_includes/footer.html
View file

@ -49,7 +49,7 @@
<li><a href="{{ basenav }}/team/">{% t nav.team %}</a></li>
<li><a href="{{ basenav }}/update/">{% t nav.update %}</a></li>
<li><a href="https://www.dashfoundation.io/" target="_blank">{% t nav.foundation %}</a></li>
<li><a href="{{ basenav }}/contact/">{% t nav.contact %}</a></li>
<li><a href="mailto:contact@dash.org">{% t nav.contact %}</a></li>
</ul>
</section>

2
_includes/hero/evolution.html
View file

@ -19,7 +19,7 @@
<div class="hero__buttons">
<a href="https://dashpay.atlassian.net/wiki/x/DQBcAg" class="btn-blue-solid btn-large" target="_blank">{% t pages.evolution.hero-btn %}</a>
<a href="{{basenav}}/contact/#mailing" class="btn-blue-solid btn-large">{% t pages.evolution.subscribe-btn %}</a>
<!--a href="{{basenav}}/contact/#mailing" class="btn-blue-solid btn-large">{% t pages.evolution.subscribe-btn %}</a-->
</div>
</div>

1
_includes/hero/merchants.html
View file

@ -17,6 +17,7 @@
<a href="https://www.zeemaps.com/map?group=2357566#" target="_blank" class="btn-white-solid">{% t pages.merchants.hero-map-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/display/DOC/Merchants" target="_blank" class="btn-white-solid">{% t pages.merchants.hero-integrate-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/x/GADeAQ" class="btn-white-solid">{% t pages.merchants.hero-getlisted-btn %}</a>
<a href="{{ basenav }}/woocommerce/" class="btn-white-solid">{% t pages.merchants.hero-woo-btn %}</a>
</div>
</div>