Merge branch 'master' of https://github.com/dashpay/dash-website

_i18n/en.yml

@@ -501,6 +501,7 @@ nav:
   shop: Shop with Dash
   debit: Dash Debit Card
   update: Update
+  evolution: Evolution
 
   participate: Contribute
   mining: Start Mining

_i18n/en/_posts/2017-02-05-ATM.md

@@ -4,8 +4,9 @@ layout: post
 image: BringDashtoyourlocalATM.jpg
 title: "Bring Dash to your local ATM!"
 ---
-“Dash is now supported on all GENERAL BYTES #bitcoin ATMs. Ask your local ATM operator to enable Dashpay today <http://thndr.me/zZnUM3>”
+Dash is now supported on all GENERAL BYTES #bitcoin ATMs. Ask your local ATM operator to enable Dashpay today <http://thndr.me/zZnUM3>
+
 Recently the GENERAL BYTES Bitcoin ATM models have been upgraded to support Dash, the 6th largest cryptocurrency in the world. You can do your part to help increase Dash adoption in the ATMs by supporting this Thunderclap event.
 We need a minimum of 100 people to support us in our goal. (*supporting us is free!) All it takes is a minute of your time and you will be able to support us using your Facebook, Twitter or Tumblr account. The Dash community will be grateful so what are you waiting for? Your favourite cryptocurrency needs you!
 <https://www.thunderclap.it/projects/52838-bring-dash-to-your-local-atm>
- (/assets/img/blog/image_file.png)
+

_i18n/en/_posts/2017-02-05-pre12-1.md

@@ -5,15 +5,25 @@ image: 12.1-2.png
 title: "Some details regarding – Sunday, February 5th, we are releasing the long-awaited 12.1 version of Dash"
 ---
 The new binaries, along with documentation, will be available in <www.dash.org>.
+
 Mining pools
+
 The information needed to the upgrade is available at <https://dashpay.atlassian.net/wiki/display/DOC/Mining+pools>
+
 Masternodes
+
 New hardware requirements and upgrade guides will be available at <https://dashpay.atlassian.net/wiki/display/DOC/Masternode+Update>
+
 Users / Exchanges
+
 Basic upgrade guide will be available upon release.
 Support about the update
 Should you have any question about the update, we recommend either:
--#dash_support_desk channel at the [Dash Nation Slack] (https://dashnation.slack.com/messages) (public, cummunity-driven Slack, you can [(sign up here)](https://dash-nation-invite.herokuapp.com)
+
+-#dash_support_desk channel at the Dash Nation Slack(public, cummunity-driven Slack, you can sign up here: 
+
+<https://dash-nation-invite.herokuapp.com>
+
 -Official forum support section. <https://www.dash.org/forum/categories/dash-support.61/?
 
 The team and the community will be available to answer arising questions.

_includes/nav-desktop.html

@@ -24,6 +24,7 @@
             <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>
 			<li class="nav__item"><a href="{{ basenav }}/update/" class="nav__link">{% t nav.update %}</a></li>
+			<li class="nav__item"><a href="{{ basenav }}/evolution/" class="nav__link">{% t nav.evolution %}</a></li>
 
             {% if page.layout != 'post' %}
             <li class="nav__item nav__item--languages">

_includes/nav-mobile.html

@@ -15,6 +15,7 @@
             <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>
             <li class="overlay-menu__item"><a href="{{ basenav }}/update/" class="overlay-menu__link">{% t nav.update %}</a></li>
+            <li class="overlay-menu__item"><a href="{{ basenav }}/evolution/" class="overlay-menu__link">{% t nav.evolution %}</a></li>
 
             {% if page.layout != 'post' %}
             <li class="overlay-menu__item overlay-menu__item--languages">

cibuild.sh

@@ -2,4 +2,4 @@
 set -e # halt script on error
 
 npm run build
-bundle exec htmlproofer ./_site --disable-external --allow-hash-href --assume-extension --alt-ignore '/.*/' --file-ignore /assets/,/dist/,/style-guide/,/blog/
+bundle exec htmlproofer ./_site --disable-external --allow-hash-href --assume-extension --alt-ignore '/.*/' --file-ignore /assets/,/dist/,/style-guide/,/blog/ --url-ignore /^\/binaries\/.+$/

evolution/index.html

@@ -42,118 +42,6 @@ description: pages.evolution.description
 		</div>
 	</section>
 
-	<!--
-		COMPONENTS
-	-->
-	<section>
-		<div class="content">
-			<div>
-				<h2>{% t pages.evolution.component-heading %}</h2>
-
-				{% tmd pages.evolution.component-text %}
-			</div>
-
-			<div class="ctabox ctabox_small-font 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">
-							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/update/network.png" class="ctabox__image">
-							</div>
-							<div class="ctabox__text">
-								<h4 class="ctabox__title">DashDrive</h4>
-								<p class="ctabox__description">A decentralized shared file system that lives on the second tier network</p>
-							</div>
-						</a>
-					</article>
-					<article class="ctabox__cta" data-js-ctabox-item>
-						<a href="https://www.livingroomofsatoshi.com/" target="_blank" class="ctabox__link">
-							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/update/update.png" class="ctabox__image">
-							</div>
-							<div class="ctabox__text">
-								<h4 class="ctabox__title">DAPI</h4>
-								<p class="ctabox__description">A decentralized API which allows third tier users to access the network securely</p>
-							</div>
-						</a>
-					</article>
-					<article class="ctabox__cta" data-js-ctabox-item>
-						<a href="https://www.bolehvpn.net/" target="_blank" class="ctabox__link">
-							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/update/frontend.png" class="ctabox__image">
-							</div>
-							<div class="ctabox__text">
-							<h4 class="ctabox__title">DashPay Decentralized Wallets</h4>
-							<p class="ctabox__description">These wallets are light clients connected to the network via DAPI and run on various platforms</p>
-							</div>
-						</a>
-					</article>
-					<article class="ctabox__cta" data-js-ctabox-item>
-						<a href="https://node40.com" target="_blank" class="ctabox__link">
-							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/update/backend.png" class="ctabox__image">
-							</div>
-							<div class="ctabox__text">
-								<h4 class="ctabox__title">Second Tier</h4>
-								<p class="ctabox__description">The masternode network, which provides compensated infrastructure for the project</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/update/code.png" class="ctabox__image">
-							</div>
-							<div class="ctabox__text">
-								<h4 class="ctabox__title"> Budgets</h4>
-								<p class="ctabox__description">The second tier is given voting power to allocate funds for specific projects on the network via the budget system</p>
-							</div>
-						</a>
-					</article>
-					<article class="ctabox__cta" data-js-ctabox-item>
-						<a href="https://misconductwineco.com/" target="_blank" class="ctabox__link">
-							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/update/strategic.jpg" class="ctabox__image">
-							</div>
-							<div class="ctabox__text">
-								<h4 class="ctabox__title">Governance</h4>
-								<p class="ctabox__description">The second tier is given voting power to govern the currency and chart the course the currency takes</p>
-							</div>
-						</a>
-					</article>
-					<article class="ctabox__cta" data-js-ctabox-item>
-						<a href="https://misconductwineco.com/" target="_blank" class="ctabox__link">
-							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/update/strategic.jpg" class="ctabox__image">
-							</div>
-							<div class="ctabox__text">
-								<h4 class="ctabox__title">Quorum Chain</h4>
-								<p class="ctabox__description">This feature introduces a permanent stable masternode list, which can be used to calculate past and present quorums</p>
-							</div>
-						</a>
-					</article>
-					<article class="ctabox__cta" data-js-ctabox-item>
-						<a href="https://misconductwineco.com/" target="_blank" class="ctabox__link">
-							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/update/strategic.jpg" class="ctabox__image">
-							</div>
-							<div class="ctabox__text">
-								<h4 class="ctabox__title">Social Wallet</h4>
-								<p class="ctabox__description">We introduce a social wallet, which allows friends lists, grouping of users and shared multisig accounts.</p>
-							</div>
-						</a>
-					</article>
-				</div>
-			</div>
-
-			<div>
-				<a href="/merchants/" target="_blank" class="btn-blue">{% t pages.evolution.slack-btn %}</a>
-				<a href="{% t pages.home.merchants-link %}" target="_blank" class="btn-blue">{% t pages.evolution.forum-btn %}</a>
-			</div>
-		</div>
-	</section>
-
-
 	<!--
 		NETWORK ARCHITECTURE
 	-->

network/index.html

@@ -42,6 +42,7 @@ description: pages.currency.description
 			<a href="http://dashvotetracker.com/" target="_blank" class="btn-blue-solid">DashVoteTracker</a>
 			<a href="https://www.dashcentral.org/" target="_blank" class="btn-blue-solid">DashCentral</a>
 			<a href="https://www.dashninja.pl/budgets.html" target="_blank" class="btn-blue-solid">DashNinja</a>
+			<a href="http://govobject-proposal.slayer.work/" target="_blank" class="btn-blue-solid">Proposal Generator</a>
 		</div>
 
 		<table id="budgets">