clean up; get-dash page fixed; changed conteain on minig page; added some links and footer and on pages

This commit is contained in:
VitaliyTr 2017-03-15 23:56:39 +07:00 committed by Chuck Williams
parent 3fe332a39f
commit e0ee8751dc
8 changed files with 78 additions and 94 deletions

View file

@ -36,12 +36,12 @@ pages:
hero-text: Dash, like most other cryptocurrencies, is based on a decentralized ledger of all transactions, known as a blockchain. This blockchain is secured through a consensus mechanism; in the case of both Dash, the consensus mechanism is Proof of Work (PoW). Miners attempt to solve difficult problems with specialized computers, and when they solve the problem, they receive the right to add a new block to the blockchain. If all the other people running the software agree that the problem was solved correctly, the block is added to the blockchain and the miner is rewarded.
hero-how-to-btn: How to start
hero-pools-btn: Tools
hero-asic-btn: ASIC HW
hero-guides-btn: Guides
pools-heading: Mining Pools
pools-text: |
DISCLAIMER: This list is provided for informational purposes only. Services listed here have not been evaluated or endorsed by the Dash developers and no guarantees are made as to the accuracy of this information. Please exercise discretion when using third-party services. If youd like to be added to this list please reach out to <a href='mailto:coingun@masternode.io'>coingun@masternode.io</a>
DISCLAIMER: This list is provided for informational purposes only. Services listed here have not been evaluated or endorsed by the Dash developers and no guarantees are made as to the accuracy of this information. Please exercise discretion when using third-party services. If youd like to be added to this list please reach out to <a href='mailto:contact@dash.org'>contact@dash.org</a>
pools-masternode-btn: Mining vs. Masternode
pools-masternode-text: |
@ -664,7 +664,11 @@ pages:
trade-btn: Trade Dash
otc-heading: Over the counter
otc-text: |
How does it work? If you want coins, we will exchange Dash for Fiat or Dash for BTC. Then we will use the fiat or BTC to pay for expenses within the project.
The benefit to the project is that we get to spend money on things that expand our reach to possible new users and spend money on other important things like a new website, pr budget, etc. The benefit to you is, you can get many more coins at the current price, then what are available on any exchange. So you can get into a Dash position much easier/cheaper than would otherwise be possible.
otc-btn: Full List
integrate-btn: Integrate Dash
full-list-btn: Full Exchanges List
@ -875,6 +879,7 @@ nav:
governance: Governance
explorers: Block Explorers
stats: Network Stats
exchanges-list: Full list of Exchanges
community: Community
discussion: Discussion

View file

@ -12,7 +12,7 @@
<section class="footer__section col-lg-2 col-md-4 col-sm-6" data-mh="footer">
{% t nav.participate %}
<ul>
<li><a href="https://dashpay.atlassian.net/wiki/display/DOC/Mining" target="_blank">{% t nav.mining %}</a></li>
<li><a href="{{ basenav }}/mining/" >{% t nav.mining %}</a></li>
<li><a href="https://dashpay.atlassian.net/wiki/display/DOC/Masternode" target="_blank">{% t nav.masternode %}</a></li>
<li><a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=1146941" target="_blank">{% t nav.wallet %}</a></li>
<li><a href="https://dashcentral.org/budget/create" target="_blank">{% t nav.funding %}</a></li>
@ -26,6 +26,7 @@
<li><a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=8585246" target="_blank">{% t nav.governance %}</a></li>
<li><a href="https://dashpay.atlassian.net/wiki/display/DOC/Block+Explorer" target="_blank">{% t nav.explorers %}</a></li>
<li><a href="http://dash-stats.com/" target="_blank">{% t nav.stats %}</a></li>
<li><a href="{{ basenav }}/exchanges/" >{% t nav.exchanges-list %}</a></li>
</ul>
</section>

View file

@ -15,9 +15,9 @@
<p class="hero__lead">{% t pages.mining.hero-text %}</p>
<div class="hero__buttons">
<a href="#" class="btn-white-solid" target="_blank">{% t pages.mining.hero-how-to-btn %}</a>
<a href="#" class="btn-white-solid" target="_blank">{% t pages.mining.hero-pools-btn %}</a>
<a href="#" class="btn-white-solid" target="_blank">{% t pages.mining.hero-guides-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/x/QYAR" class="btn-white-solid" target="_blank">{% t pages.mining.hero-how-to-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/x/CQD7Ag" class="btn-white-solid" target="_blank">{% t pages.mining.hero-asic-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/x/SIBuAQ" class="btn-white-solid" target="_blank">{% t pages.mining.hero-guides-btn %}</a>
</div>
</div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

View file

@ -19,10 +19,9 @@ description: pages.get-dash.description
<h2 class="section__title">{% t pages.get-dash.claim-heading %}</h2>
<p class="section__lead bottom-space">{% t pages.get-dash.claim-subline %}</p>
<div class="hero__buttons">
<a href="#getdash-wallet-setup" class="btn-white-solid">{% t pages.get-dash.guide-btn %}</a>
<a href="#getdash-buy" class="btn-white-solid">{% t pages.get-dash.buy-btn %}</a>
<a href="#getdash-shop" class="btn-white-solid">{% t pages.get-dash.spend-btn %}</a>
<a href="#getdash-trade" class="btn-white-solid">{% t pages.get-dash.trade-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=48693287" target="_blank" class="btn-white-solid">{% t pages.get-dash.buy-btn %}</a>
<a href="https://www2.dash.org/merchants/" target="_blank" class="btn-white-solid">{% t pages.get-dash.spend-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=48693307" target="_blank" class="btn-white-solid">{% t pages.get-dash.trade-btn %}</a>
</div>
</div>
</section>
@ -35,9 +34,9 @@ description: pages.get-dash.description
<div class="ctabox ctabox--gray-light-bg" data-js-ctabox>
<div class="ctabox__inner">
<article class="ctabox__cta" data-js-ctabox-item>
<a href="https://shakepay.co" target="_blank" class="ctabox__link">
<a href="https://poloniex.com/" target="_blank" class="ctabox__link">
<div class="ctabox__imagewrapper">
<img src="/assets/img/merchants/shakepay_logo.png" class="ctabox__image">
<img src="/assets/img/get-dash/poloniex.png" class="ctabox__image">
</div>
<div class="ctabox__text">
<h4 class="ctabox__title">POLONIEX</h4>
@ -46,9 +45,9 @@ description: pages.get-dash.description
</a>
</article>
<article class="ctabox__cta" data-js-ctabox-item>
<a href="https://www.livingroomofsatoshi.com/" target="_blank" class="ctabox__link">
<a href="https://btc-e.com/" target="_blank" class="ctabox__link">
<div class="ctabox__imagewrapper">
<img src="/assets/img/merchants/livingroomofsatoshi_logo.png" class="ctabox__image">
<img src="/assets/img/get-dash/btc-e.png" class="ctabox__image">
</div>
<div class="ctabox__text">
<h4 class="ctabox__title">BTC-E</h4>
@ -57,35 +56,24 @@ description: pages.get-dash.description
</a>
</article>
<article class="ctabox__cta" data-js-ctabox-item>
<a href="https://www.claws-mail.org/" target="_blank" class="ctabox__link">
<a href="https://www.bitfinex.com" target="_blank" class="ctabox__link">
<div class="ctabox__imagewrapper">
<img src="/assets/img/merchants/ClawsMail.jpg" class="ctabox__image">
<img src="/assets/img/get-dash/bitfinex.png" class="ctabox__image">
</div>
<div class="ctabox__text">
<h4 class="ctabox__title">BIFINEX</h4>
<p class="ctabox__description">Dash-Visa Debit Card</p>
<p class="ctabox__description">Exchange market</p>
</div>
</a>
</article>
<article class="ctabox__cta" data-js-ctabox-item>
<a href="https://node40.com" target="_blank" class="ctabox__link">
<a href="https://bittrex.com/" target="_blank" class="ctabox__link">
<div class="ctabox__imagewrapper">
<img src="/assets/img/merchants/node40.png" class="ctabox__image">
<img src="/assets/img/get-dash/bittrex-logo.jpg" class="ctabox__image">
</div>
<div class="ctabox__text">
<h4 class="ctabox__title">COINAPULT</h4>
<p class="ctabox__description">Pay bills in Australia</p>
</div>
</a>
</article>
<article class="ctabox__cta" data-js-ctabox-item>
<a href="https://shapeshift.io" target="_blank" class="ctabox__link">
<div class="ctabox__imagewrapper">
<img src="/assets/img/merchants/shapeshift_logo.png" class="ctabox__image">
</div>
<div class="ctabox__text">
<h4 class="ctabox__title">ShapeShift</h4>
<p class="ctabox__description">Exchange Dash for Bitcoin</p>
<h4 class="ctabox__title">bittrex</h4>
<p class="ctabox__description">Exchange market</p>
</div>
</a>
</article>
@ -136,6 +124,16 @@ description: pages.get-dash.description
</div>
<div class="member__name" style="height: 35px;">Shapeshift</div>
</li>
<li class="member" style="height: 219px;">
<div class="member__avatar">
<div class="member__image-wrapper">
<a href="https://arbitrcoin.com/" target="_blank" class="member__link">
<img class="member__image" src="/assets/img/get-dash/Arbitcoin-logo.png" alt="Shapeshift">
</a>
</div>
</div>
<div class="member__name" style="height: 35px;">ArbiytrCoin</div>
</li>
</ul>
</div>
@ -145,7 +143,7 @@ description: pages.get-dash.description
<div class="content">
<h2 class="section__title">{% t pages.get-dash.otc-heading %}</h2>
<div class="row">
<div class="col-sm-6 col-md-3">
<div class="col-sm-3">
<div class="news-post">
<a href="/2017/03/12/woscryptoshow.html">
<div class="news-image">
@ -157,31 +155,13 @@ description: pages.get-dash.description
</a>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="news-post">
<a href="/2017/03/12/dd1.html">
<div class="news-image">
<img src="/assets/img/blog/2017-03-12-dd1.png">
</div>
<div class="news-body news-body--short">
<h3 class="news-title">The first DD Spotlight! </h3>
</div>
</a>
<div class="col-sm-6">
{% tmd pages.get-dash.otc-text %}
<div class="text-center">
<a href="https://dashpay.atlassian.net/wiki/x/UoFNBg" target="_blank" class="btn-blue">{% t pages.get-dash.otc-btn %}</a>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="news-post">
<a href="/2017/03/11/SEC.html">
<div class="news-image">
<img src="/assets/img/blog/2017-03-11-SEC.jpg">
</div>
<div class="news-body news-body--short">
<h3 class="news-title">The biggest threat</h3>
</div>
</a>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="col-sm-3">
<div class="news-post">
<a href="/2017/03/10/priceexplained.html">
<div class="news-image">

View file

@ -11,6 +11,41 @@ description: pages.mining.description
<div class="page page--home">
<section class="section">
<div class="section__content">
<h2 class="section__title"">{% t pages.mining.how-start-heading %}</h2>
<div class="row">
<div class="col-sm-6">
<h2>{% t pages.mining.asic-heading %}</h2>
<div class="bottom-space">{% tmd pages.mining.asic-text %}</div>
<a href="#" class="btn-blue">{% t pages.mining.asic-pinidea-btn %}</a>
<a href="#" class="btn-blue">{% t pages.mining.asic-pinidea-usb-btn %}</a>
<a href="#" class="btn-blue">{% t pages.mining.asic-ibelink-miner %}</a>
<a href="#" class="btn-blue">{% t pages.mining.asic-baikal-mini-miner %}</a>
<a href="#" class="btn-blue">{% t pages.mining.asic-baikal-miner %}</a>
</div>
<div class="col-sm-6">
<h2>{% t pages.mining.cpu-gpu-heading %}</h2>
<div class="bottom-space">{% tmd pages.mining.cpu-gpu-text %}</div>
<a href="#" class="btn-blue">{% t pages.mining.cpu-mining-btn %}</a>
<a href="#" class="btn-blue">{% t pages.mining.sg-miner-btn %}</a>
<a href="#" class="btn-blue">{% t pages.mining.pools-stat-heading %}</a>
<a href="#" class="btn-blue">{% t pages.mining.amd-mining-btn %}</a>
</div>
</div>
</div>
</section>
<section class="b-mining-section bottom-space">
<div class="content">
<div>
<a href="https://dashpay.atlassian.net/wiki/x/j5AxBg" class="btn-white-solid" target="_blank">{% t pages.mining.pools-masternode-btn %}</a>
</div>
{% tmd pages.mining.pools-masternode-text %}
</div>
</section>
<section class="section">
<div class="section__content">
<h2 class="section__title">{% t pages.mining.pools-heading %}</h2>
@ -81,43 +116,6 @@ description: pages.mining.description
</div>
</section>
<section class="b-mining-section bottom-space">
<div class="content">
{% tmd pages.mining.pools-masternode-text %}
<div>
<a href="https://dashpay.atlassian.net/wiki/x/j5AxBg" class="btn-white-solid" target="_blank">{% t pages.mining.pools-masternode-btn %}</a>
</div>
</div>
</section>
<section class="section">
<div class="section__content">
<h2 class="section__title"">{% t pages.mining.how-start-heading %}</h2>
<div class="row">
<div class="col-sm-6">
<h2>{% t pages.mining.asic-heading %}</h2>
<div class="bottom-space">{% tmd pages.mining.asic-text %}</div>
<a href="#" class="btn-blue">{% t pages.mining.asic-pinidea-btn %}</a>
<a href="#" class="btn-blue">{% t pages.mining.asic-pinidea-usb-btn %}</a>
<a href="#" class="btn-blue">{% t pages.mining.asic-ibelink-miner %}</a>
<a href="#" class="btn-blue">{% t pages.mining.asic-baikal-mini-miner %}</a>
<a href="#" class="btn-blue">{% t pages.mining.asic-baikal-miner %}</a>
</div>
<div class="col-sm-6">
<h2>{% t pages.mining.cpu-gpu-heading %}</h2>
<div class="bottom-space">{% tmd pages.mining.cpu-gpu-text %}</div>
<a href="#" class="btn-blue">{% t pages.mining.cpu-mining-btn %}</a>
<a href="#" class="btn-blue">{% t pages.mining.sg-miner-btn %}</a>
<a href="#" class="btn-blue">{% t pages.mining.pools-stat-heading %}</a>
<a href="#" class="btn-blue">{% t pages.mining.amd-mining-btn %}</a>
</div>
</div>
</div>
</section>
<section class="section">
<div class="section__content">
<h2 class="bottom-space">{% t pages.mining.pools-stat-heading %}</h2>

View file

@ -496,7 +496,7 @@ a.blog_link {
}
}
.warning-bg{
background-color: #fff7af;
background-color: #FFFFBC;
padding: 10px 15px;
}
.youtube-small{