diff --git a/_i18n/en.yml b/_i18n/en.yml index 27f3ffe..5249414 100755 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -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 you’d like to be added to this list please reach out to coingun@masternode.io + 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 you’d like to be added to this list please reach out to contact@dash.org 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 diff --git a/_includes/footer.html b/_includes/footer.html index d63ea5b..2d94140 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -12,7 +12,7 @@
{% t nav.participate %}
diff --git a/_includes/hero/mining.html b/_includes/hero/mining.html index 3e6cdab..1f115d3 100644 --- a/_includes/hero/mining.html +++ b/_includes/hero/mining.html @@ -15,9 +15,9 @@

{% t pages.mining.hero-text %}

- {% t pages.mining.hero-how-to-btn %} - {% t pages.mining.hero-pools-btn %} - {% t pages.mining.hero-guides-btn %} + {% t pages.mining.hero-how-to-btn %} + {% t pages.mining.hero-asic-btn %} + {% t pages.mining.hero-guides-btn %}
diff --git a/assets/img/get-dash/Arbitcoin-logo.png b/assets/img/get-dash/Arbitcoin-logo.png new file mode 100644 index 0000000..61d5ae6 Binary files /dev/null and b/assets/img/get-dash/Arbitcoin-logo.png differ diff --git a/assets/img/get-dash/bittrex-logo.jpg b/assets/img/get-dash/bittrex-logo.jpg new file mode 100644 index 0000000..8030bfa Binary files /dev/null and b/assets/img/get-dash/bittrex-logo.jpg differ diff --git a/get-dash/index.html b/get-dash/index.html index 0aa35b0..74e8ec6 100644 --- a/get-dash/index.html +++ b/get-dash/index.html @@ -19,10 +19,9 @@ description: pages.get-dash.description

{% t pages.get-dash.claim-heading %}

{% t pages.get-dash.claim-subline %}

- {% t pages.get-dash.guide-btn %} - {% t pages.get-dash.buy-btn %} - {% t pages.get-dash.spend-btn %} - {% t pages.get-dash.trade-btn %} + {% t pages.get-dash.buy-btn %} + {% t pages.get-dash.spend-btn %} + {% t pages.get-dash.trade-btn %}
@@ -35,9 +34,9 @@ description: pages.get-dash.description
- @@ -136,6 +124,16 @@ description: pages.get-dash.description
Shapeshift
+
  • +
    +
    + + Shapeshift + +
    +
    +
    ArbiytrCoin
    +
    • @@ -145,7 +143,7 @@ description: pages.get-dash.description

    {% t pages.get-dash.otc-heading %}

    -
    +
    @@ -157,31 +155,13 @@ description: pages.get-dash.description
    -
    -
    - -
    - -
    -
    -

    The first DD Spotlight!

    -
    -     +
    + {% tmd pages.get-dash.otc-text %} +
    + {% t pages.get-dash.otc-btn %}
    -
    -
    - -
    - -
    -
    -

    The biggest threat

    -
    -     -
    -
    -
    +
    diff --git a/mining/index.html b/mining/index.html index 5b8c085..bb64f23 100644 --- a/mining/index.html +++ b/mining/index.html @@ -11,6 +11,41 @@ description: pages.mining.description
    +
    +
    +

    {% t pages.mining.how-start-heading %}

    +
    +
    +

    {% t pages.mining.asic-heading %}

    +
    {% tmd pages.mining.asic-text %}
    +     {% t pages.mining.asic-pinidea-btn %} + {% t pages.mining.asic-pinidea-usb-btn %} + {% t pages.mining.asic-ibelink-miner %} + {% t pages.mining.asic-baikal-mini-miner %} + {% t pages.mining.asic-baikal-miner %} +
    +
    +

    {% t pages.mining.cpu-gpu-heading %}

    +
    {% tmd pages.mining.cpu-gpu-text %}
    + {% t pages.mining.cpu-mining-btn %} + {% t pages.mining.sg-miner-btn %} + {% t pages.mining.pools-stat-heading %} + {% t pages.mining.amd-mining-btn %} +
    +
    +
    +
    + + +
    +
    + + {% tmd pages.mining.pools-masternode-text %} +
    +
    +

    {% t pages.mining.pools-heading %}

    @@ -81,43 +116,6 @@ description: pages.mining.description
    -
    -
    - - {% tmd pages.mining.pools-masternode-text %} - - -
    -
    - - -
    -
    -

    {% t pages.mining.how-start-heading %}

    -
    -
    -

    {% t pages.mining.asic-heading %}

    -
    {% tmd pages.mining.asic-text %}
    - {% t pages.mining.asic-pinidea-btn %} - {% t pages.mining.asic-pinidea-usb-btn %} - {% t pages.mining.asic-ibelink-miner %} - {% t pages.mining.asic-baikal-mini-miner %} - {% t pages.mining.asic-baikal-miner %} -
    -
    -

    {% t pages.mining.cpu-gpu-heading %}

    -
    {% tmd pages.mining.cpu-gpu-text %}
    - {% t pages.mining.cpu-mining-btn %} - {% t pages.mining.sg-miner-btn %} - {% t pages.mining.pools-stat-heading %} - {% t pages.mining.amd-mining-btn %} -
    -
    -
    -
    -

    {% t pages.mining.pools-stat-heading %}

    diff --git a/src/scss/_junk-drawer.scss b/src/scss/_junk-drawer.scss index 5a98ac5..5348ef7 100755 --- a/src/scss/_junk-drawer.scss +++ b/src/scss/_junk-drawer.scss @@ -496,7 +496,7 @@ a.blog_link { } } .warning-bg{ - background-color: #fff7af; + background-color: #FFFFBC; padding: 10px 15px; } .youtube-small{