Merge remote-tracking branch 'dashpay/master'

This commit is contained in:
tungfa 2017-04-04 17:31:25 +08:00
commit 23402f9c6f
3 changed files with 12 additions and 9 deletions

View file

@ -32,7 +32,7 @@ pages:
vitrtual-kiosk-heading: Quick Guide To Operating a Virtual Currency Kiosk
vitrtual-kiosk-btn: Learn More
learn-more-btn: Learn More
audio-heading: Audio Guides
audio-text: Convert local currency to Dash and send it to your wallet
@ -865,6 +865,9 @@ pages:
hero-development-btn: Development
hero-masternodes-btn: Masternodes
hero-video-btn: Video & Audio
hero-graphics-btn: Graphics
hero-legal-btn: Legal
hero-wiki-btn: Wiki
discussion-heading: Discussion
discussion-text: Discuss Dash on these forums
@ -945,7 +948,7 @@ nav:
stats: Network Stats
exchanges-list: Full list of Exchanges
community: Community
community: Resources
discussion: Discussion
social-apps: Social Apps
news: News & Info

View file

@ -20,11 +20,11 @@
</div>
<div class="hero__buttons">
<a href="#community-discussion" class="btn-white-solid">{% t pages.community.hero-discussion-btn %}</a>
<a href="#community-social" class="btn-white-solid">{% t pages.community.hero-social-btn %}</a>
<a href="#community-news" class="btn-white-solid">{% t pages.community.hero-news-btn %}</a>
<a href="{{ basenav }}/graphics/" class="btn-white-solid">{% t pages.community.hero-graphics-btn %}</a>
<a href="{{ basenav }}/legal/" class="btn-white-solid">{% t pages.community.hero-legal-btn %}</a>
<a href="#community-development" class="btn-white-solid">{% t pages.community.hero-development-btn %}</a>
<a href="#community-masternode" class="btn-white-solid">{% t pages.community.hero-masternodes-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/display/DOC/Site+map" class="btn-white-solid" target="_blank">{% t pages.community.hero-wiki-btn %}</a>
<!--<a href="#community-media" class="btn-white-solid">{% t pages.community.hero-video-btn %}</a>-->
</div>
</div>

View file

@ -128,23 +128,23 @@ description: pages.legal.description
<article class="info-grid__item" data-mh="get-dash-info-grid" id="getdash-wallet-setup">
<h3 class="info-grid__item-title">{% t pages.legal.vitrtual-kiosk-heading %}</h3>
<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=105746151#FIAT-DASHCompliance/ATMCompliance-STEP1)" target="_blank" class="info-grid__item-link">{% t pages.legal.setup-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=105746151#FIAT-DASHCompliance/ATMCompliance-STEP1)" target="_blank" class="info-grid__item-link">{% t pages.legal.learn-more-btn %}</a>
</article>
<article class="info-grid__item" data-mh="get-dash-info-grid" id="getdash-buy">
<h3 class="info-grid__item-title">{% t pages.legal.audio-heading %}</h3>
<p class="info-grid__item-text">{% t pages.legal.audio-text %}</p>
<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=105746151#FIAT-DASHCompliance/ATMCompliance-STEP2)" target="_blank" class="info-grid__item-link">{% t pages.legal.vitrtual-kiosk-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=105746151#FIAT-DASHCompliance/ATMCompliance-STEP2)" target="_blank" class="info-grid__item-link">{% t pages.legal.learn-more-btn %}</a>
</article>
<article class="info-grid__item" data-mh="get-dash-info-grid" id="getdash-trade">
<h3 class="info-grid__item-title">{% t pages.legal.report-heading %}</h3>
<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=105746151#FIAT-DASHCompliance/ATMCompliance-STEP3)" target="_blank" class="info-grid__item-link">{% t pages.legal.report-heading-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=105746151#FIAT-DASHCompliance/ATMCompliance-STEP3)" target="_blank" class="info-grid__item-link">{% t pages.legal.learn-more-btn %}</a>
</article>
<article class="info-grid__item" data-mh="get-dash-info-grid" id="getdash-trade">
<h3 class="info-grid__item-title">{% t pages.legal.docs-heading %}</h3>
<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=105746151#FIAT-DASHCompliance/ATMCompliance-STEP3)" target="_blank" class="info-grid__item-link">{% t pages.legal.docs-heading-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=105746151#FIAT-DASHCompliance/ATMCompliance-STEP3)" target="_blank" class="info-grid__item-link">{% t pages.legal.learn-more-btn %}</a>
</article>
</div>
</div>