diff --git a/_data/team.yml b/_data/team.yml index e9e381a..cbd2479 100644 --- a/_data/team.yml +++ b/_data/team.yml @@ -215,14 +215,22 @@ pgp: https://keybase.io/alex_ru twitter: -- name: Alexy and Raico - title: Dash China Coordinators +- name: Alexy + title: Dash China Coordinator description: \"Alexy\" has a degree in English and International Business. Specializing in Chinese Market, he brings years of experience as a freelance writer and online event organizer. Fluent in Chinese, Japanese and English. image: Alexy.jpg email: alexy@dash.org pgp: https://keybase.io/alexy_ys twitter: +- name: Raico + title: Dash China Coordinator + description: \"Alexy\" has a degree in English and International Business. Specializing in Chinese Market, he brings years of experience as a freelance writer and online event organizer. Fluent in Chinese, Japanese and English. + image: raico.jpg + email: raico@dash.org + pgp: https://keybase.io/raico + twitter: + - name: David Dinkins title: Writer / Editor description: David Dinkins (AKA \"ddink7\") works in retail management, and has his master's degree in history. He has been part of the Dash project since a few months after its inception. His role is primarily writing and editing. David is also currently working on his MBA. diff --git a/_i18n/en.yml b/_i18n/en.yml index 04ca4c5..9edee4e 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -13,53 +13,77 @@ pages: subscribe-btn: Subscribe - video-heading: CORE DEVELOPMENT - video-text: The first area of progress is Dash Core. In addition to running the network at present, Dash Core also serves as the backbone of the Evolution engine. + video-heading: DEVELOPMENT + video-text: Dash Evolution creates a new type of cryptographic currency with various advanced features that assist in the creation of decentralized technology. Dash introduces a tiered network design, which allows users to do various jobs for the network, along with decentralized API access and a decentralized file system. video-btn: Overview Video + sentinel-btn: Sentinel - merchants-heading: WooCommerce Integration - merchants-text: Download Plugin for WooCommerce Wordpress and start using Digital Cash! - merchants-btn: Get Plugin + prototype-heading: Dash Evolution Prototype + prototype-text: We will be writing the software for this project in stages, the first stage will take about 2 months to have a very early prototype for Dash Evolution that includes a basic implementation of DashDrive, Primitives, DAPI and a simple T3 wallet. In six to eight months, we should be entering testnet phase with most basic functionality. In 12-18 months, we plan for the first release version (a stable prototype). + prototype-btn: Dash Prototype - integrate-heading: 12.1 Updates - integrate-text: Sentinel can also be re-geared and deployed to operate digital companies that have a built-in workforce, infrastructure to deploy again, and as an engine for storage and retrieval of information. - - slack-btn: Slack Chanel - forum-btn: Dash Forums - - execution-heading: STRATEGIC EXECUTION - execution-text: - Ryan Taylor, Dash’s CFO, has coordinated a deal with Arizona State University’s SkySong incubator, allowing us access to their top tier facility in Tempe, Arizona. + component-heading: Dash Evolution Prototype + component-text: We will be writing the software for this project in stages, the first stage will take about 2 months to have a very early prototype for Dash Evolution that includes a basic implementation of DashDrive, Primitives, DAPI and a simple T3 wallet. In six to eight months, we should be entering testnet phase with most basic functionality. In 12-18 months, we plan for the first release version (a stable prototype). + component-btn: Dash Prototype - There are 29 fast-growing, innovative startups sharing this location, and we look forward to talking with many of them. We also look forward to hiring exceptional talent from the University. + feature-private-heading: Private + feature-private-text: Protect your financial information. PrivateSend ensures your activity history and balances are private. + feature-instant-heading: Instant + feature-instant-text: Your time is valuable. InstantSend payments confirm in less than a second. + feature-secure-heading: Secure + feature-secure-text: Security you can count on. Transactions are confirmed by 1,000 Gigahash of X11 ASIC computing power and over 4,100 servers hosted around the world. - execution-btn: Learn More - execution-link: https://www.dash.org/forum/threads/january-2017-budget-report.12601/ + merchants-heading: Shop direct with Dash + merchants-text: Instant and private purchases, direct from your Dash wallet + merchants-btn: More Merchants + merchants-link: https://dashpay.atlassian.net/wiki/display/DOC/Merchant+Directory+Listing + merchants-join-btn: Become a Merchant + merchants-join-link: https://dashpay.atlassian.net/wiki/display/DOC/Integrate+Dash+Payments - update-heading: EVOLUTION UPDATE - update-text: - Lead evolution developer Andy Freer has been locked away producing huge amounts of documentation for the various concepts of Evolution. This comes after months of conversations between Andy and myself about how each component of Evolution works, then reimagining it and improving the components and designs systematically. + architecture-heading: Next-Gen P2P Network + architecture-text: + At Dash’s core is a unique fully-incentivized peer-to-peer network. Miners are rewarded for securing the blockchain and masternodes are rewarded for validating, storing and serving the blockchain to users. - Since the original research phase, documentation, specifications, plans and diagrams have been being drafted, growing into a collection of documents that will be put into a wiki with full documentation for Evolution’s end-to-end design and implementation. + + Masternodes represent a new layer of network servers that work in highly secure clusters called quorums to provide a variety of decentralized services, like instant transactions, privacy and governance, while eliminating the threat of low-cost network attacks. + + architecture-btn: Learn More + architecture-link: https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=8585240 + + governance-heading: First Self Governing, Self Funding Protocol + governance-text: In Dash, everyone has a voice and the ability to propose projects directly to the network. Anything you can do - from marketing to development - that helps Dash grow and improve can be funded. This means Dash funds its own growth and adoption, consensus is guaranteed, and everyone is accountable to the network. + + + Just submit a treasury proposal and present your idea to the network for funding and make your case, or if you operate a Masternode, be sure to vote! proposal-btn: Proposals proposal-submit-btn: Submit a Proposal - evolution-research-heading: EVOLUTION RESEARCH - evolution-research-text: - In January 2016 we released an early Evolution prototype based on Electrum which enabled basic functions such as registering a username and paying friends by name. + network-growth-heading: The Fastest Growing Network + network-growth-text: + Thanks to incentivization, Dash’s network has grown to 4,100 masternodes since launch in 2014, meaning Dash’s peer-to-peer network is one of the largest in the world. - The prototype was pretty basic, with user interaction limited to just paying a few friends and user data stored on a dev server, but at least it proved the concept. - What we set out to do then was to design and prototype all the key technologies that would make these functions work in a purely P2P way, with data secured on the Dash blockchain and accessible from anywhere on any device, with integrated SPV based security and no centralized intermediary services required, and using the most common and censorship resistant protocol available – HTTP(S) - evolution-research-btn: Network Stats - launching-heading: LAUNCHING DATES - launching-text: > - Launching a new software release on the network requires that all budget proposals be re-submitted into the system. + More nodes means more secure services, and more capacity for end-users to access Digital Cash from anywhere in the world, 24/7. + network-growth-btn: Network Stats + + evolution-heading: Digital Currency Evolution + evolution-text: + + What's next? We want digital currencies to be so easy to use your Grandma would use them. + + + Dash Evolution will enable you to signup and access your Dash from any device and transact as easily as you can with PayPal, but in a fully decentralized way. Stay tuned... + evolution-btn: Learn More + evolution-link: https://dashpay.atlassian.net/wiki/display/DOC/Evolution + + news-heading: Latest News + news-btn: View All News + + get-started-heading: Get Started + get-started-text: Download the wallet and start using Digital Cash! + get-started-btn: Get Dash - Due to the timing of superblocks, we have a short window to launch, near the beginning of the month. In order to ensure we launch the most stable possible version of the software without interfering with the budget system, we would like to hold off until early February to launch 12.1. Launch date: February 5th, 2017. - launching-btn: Budgets - launching-link: https://www.dashcentral.org/budget update: title: Dash Official Website | Dash Crypto Currency description: Dash is Digital Cash diff --git a/_includes/hero/home.html b/_includes/hero/home.html index 9983fca..5e2b8a6 100644 --- a/_includes/hero/home.html +++ b/_includes/hero/home.html @@ -10,6 +10,7 @@ {% include nav-desktop.html %} + {% include base.html %}
@@ -17,7 +18,7 @@

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

- {% t nav.get-dash %} + {% t nav.get-dash %}
diff --git a/_includes/hero/update.html b/_includes/hero/update.html index 2d2c251..ae2274b 100755 --- a/_includes/hero/update.html +++ b/_includes/hero/update.html @@ -1,25 +1,26 @@ -
-
- {% srcset hero/home.jpg ppi:1,2 class="hero__background-image" %} - {% srcset_source width:1920 %} - {% srcset_source width:1280 %} - {% srcset_source width:1024 %} - {% srcset_source width:800 %} - {% endsrcset %} -
- - - {% include nav-desktop.html %} - - -
-

{% t pages.update.hero-heading %}

-

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

-
- {% t pages.update.hero-btn %} -
-
- - -
-
+
+
+ {% srcset hero/home.jpg ppi:1,2 class="hero__background-image" %} + {% srcset_source width:1920 %} + {% srcset_source width:1280 %} + {% srcset_source width:1024 %} + {% srcset_source width:800 %} + {% endsrcset %} +
+ + + {% include nav-desktop.html %} + {% include base.html %} + + +
+

{% t pages.update.hero-heading %}

+

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

+
+ {% t pages.update.hero-btn %} +
+
+ + +
+
diff --git a/assets/img/community/android.png b/assets/img/community/android.png index ac0709d..35a5ba8 100644 Binary files a/assets/img/community/android.png and b/assets/img/community/android.png differ diff --git a/assets/img/community/atlassian_logo.png b/assets/img/community/atlassian_logo.png index 74500ad..92aeafe 100644 Binary files a/assets/img/community/atlassian_logo.png and b/assets/img/community/atlassian_logo.png differ diff --git a/assets/img/community/bitcoindotcom_logo.png b/assets/img/community/bitcoindotcom_logo.png index df54a91..8739134 100644 Binary files a/assets/img/community/bitcoindotcom_logo.png and b/assets/img/community/bitcoindotcom_logo.png differ diff --git a/assets/img/community/bitcointalk-logo.png b/assets/img/community/bitcointalk-logo.png index 982952a..c97590e 100644 Binary files a/assets/img/community/bitcointalk-logo.png and b/assets/img/community/bitcointalk-logo.png differ diff --git a/assets/img/community/bitcointalk_logo.png b/assets/img/community/bitcointalk_logo.png index 9f6a4f8..6c18b9e 100644 Binary files a/assets/img/community/bitcointalk_logo.png and b/assets/img/community/bitcointalk_logo.png differ diff --git a/assets/img/community/dash_logo.png b/assets/img/community/dash_logo.png index 547a869..dfa8bad 100644 Binary files a/assets/img/community/dash_logo.png and b/assets/img/community/dash_logo.png differ diff --git a/assets/img/community/dashcentral_logo.png b/assets/img/community/dashcentral_logo.png index f8e7d03..c637415 100644 Binary files a/assets/img/community/dashcentral_logo.png and b/assets/img/community/dashcentral_logo.png differ diff --git a/assets/img/community/dashdotalpha_logo.png b/assets/img/community/dashdotalpha_logo.png index 8897788..dd1e491 100644 Binary files a/assets/img/community/dashdotalpha_logo.png and b/assets/img/community/dashdotalpha_logo.png differ diff --git a/assets/img/community/dashforum_logo.png b/assets/img/community/dashforum_logo.png index 91f4d6b..c21f69d 100644 Binary files a/assets/img/community/dashforum_logo.png and b/assets/img/community/dashforum_logo.png differ diff --git a/assets/img/community/dashnation_logo.png b/assets/img/community/dashnation_logo.png index 5f4fdb1..5dbf9c8 100644 Binary files a/assets/img/community/dashnation_logo.png and b/assets/img/community/dashnation_logo.png differ diff --git a/assets/img/community/dashndrink_logo.png b/assets/img/community/dashndrink_logo.png index cd71291..b075e55 100644 Binary files a/assets/img/community/dashndrink_logo.png and b/assets/img/community/dashndrink_logo.png differ diff --git a/assets/img/community/dashninja_logo.png b/assets/img/community/dashninja_logo.png index 1c39868..c0c527b 100644 Binary files a/assets/img/community/dashninja_logo.png and b/assets/img/community/dashninja_logo.png differ diff --git a/assets/img/community/dashtalk_logo.png b/assets/img/community/dashtalk_logo.png index 36e721b..bad8502 100644 Binary files a/assets/img/community/dashtalk_logo.png and b/assets/img/community/dashtalk_logo.png differ diff --git a/assets/img/community/dashtimes_logo.png b/assets/img/community/dashtimes_logo.png index d291ac6..624fafb 100644 Binary files a/assets/img/community/dashtimes_logo.png and b/assets/img/community/dashtimes_logo.png differ diff --git a/assets/img/community/electrum.png b/assets/img/community/electrum.png index f47bdc1..6064eed 100644 Binary files a/assets/img/community/electrum.png and b/assets/img/community/electrum.png differ diff --git a/assets/img/community/exodus.png b/assets/img/community/exodus.png index edbb787..70ee5b2 100644 Binary files a/assets/img/community/exodus.png and b/assets/img/community/exodus.png differ diff --git a/assets/img/community/facebook_logo.png b/assets/img/community/facebook_logo.png index 7438ee1..225fb91 100644 Binary files a/assets/img/community/facebook_logo.png and b/assets/img/community/facebook_logo.png differ diff --git a/assets/img/community/github_logo.png b/assets/img/community/github_logo.png index c041e2b..48bd9cf 100644 Binary files a/assets/img/community/github_logo.png and b/assets/img/community/github_logo.png differ diff --git a/assets/img/community/github_octocat.png b/assets/img/community/github_octocat.png index 9c0f933..fa6fec0 100644 Binary files a/assets/img/community/github_octocat.png and b/assets/img/community/github_octocat.png differ diff --git a/assets/img/community/googleplus_logo.png b/assets/img/community/googleplus_logo.png index bcc75c2..24517b6 100644 Binary files a/assets/img/community/googleplus_logo.png and b/assets/img/community/googleplus_logo.png differ diff --git a/assets/img/community/instagram_logo.png b/assets/img/community/instagram_logo.png index aaa6f5b..4f977ce 100644 Binary files a/assets/img/community/instagram_logo.png and b/assets/img/community/instagram_logo.png differ diff --git a/assets/img/community/jaxx.png b/assets/img/community/jaxx.png index c8518f5..cadaa20 100644 Binary files a/assets/img/community/jaxx.png and b/assets/img/community/jaxx.png differ diff --git a/assets/img/community/jira_logo.png b/assets/img/community/jira_logo.png index 76c24de..d710b20 100644 Binary files a/assets/img/community/jira_logo.png and b/assets/img/community/jira_logo.png differ diff --git a/assets/img/community/linkedin_logo.png b/assets/img/community/linkedin_logo.png index 0f3794e..6f0c7eb 100644 Binary files a/assets/img/community/linkedin_logo.png and b/assets/img/community/linkedin_logo.png differ diff --git a/assets/img/community/linux_32.png b/assets/img/community/linux_32.png index ffddf66..c380d6d 100644 Binary files a/assets/img/community/linux_32.png and b/assets/img/community/linux_32.png differ diff --git a/assets/img/community/linux_64.png b/assets/img/community/linux_64.png index 308bafe..440cfd4 100644 Binary files a/assets/img/community/linux_64.png and b/assets/img/community/linux_64.png differ diff --git a/assets/img/community/masternodeme_logo.png b/assets/img/community/masternodeme_logo.png index ac79724..a72f4e1 100644 Binary files a/assets/img/community/masternodeme_logo.png and b/assets/img/community/masternodeme_logo.png differ diff --git a/assets/img/community/mycelium.png b/assets/img/community/mycelium.png index 98d10da..825f68b 100644 Binary files a/assets/img/community/mycelium.png and b/assets/img/community/mycelium.png differ diff --git a/assets/img/community/node40_logo.png b/assets/img/community/node40_logo.png index 005d685..6cad355 100644 Binary files a/assets/img/community/node40_logo.png and b/assets/img/community/node40_logo.png differ diff --git a/assets/img/community/osx.png b/assets/img/community/osx.png index 4ffb2c1..75cd98e 100644 Binary files a/assets/img/community/osx.png and b/assets/img/community/osx.png differ diff --git a/assets/img/community/reddit_logo.png b/assets/img/community/reddit_logo.png index e79d044..2a9edb2 100644 Binary files a/assets/img/community/reddit_logo.png and b/assets/img/community/reddit_logo.png differ diff --git a/assets/img/community/slack_logo.png b/assets/img/community/slack_logo.png index 242f33c..5889de0 100644 Binary files a/assets/img/community/slack_logo.png and b/assets/img/community/slack_logo.png differ diff --git a/assets/img/community/twitter_logo.png b/assets/img/community/twitter_logo.png index 340aef1..9acd046 100644 Binary files a/assets/img/community/twitter_logo.png and b/assets/img/community/twitter_logo.png differ diff --git a/assets/img/community/win_32.png b/assets/img/community/win_32.png index 1471c59..202a1b7 100644 Binary files a/assets/img/community/win_32.png and b/assets/img/community/win_32.png differ diff --git a/assets/img/community/win_64.png b/assets/img/community/win_64.png index 41430ba..1265add 100644 Binary files a/assets/img/community/win_64.png and b/assets/img/community/win_64.png differ diff --git a/assets/img/community/youtube_logo.png b/assets/img/community/youtube_logo.png index 57fafaf..2a437aa 100644 Binary files a/assets/img/community/youtube_logo.png and b/assets/img/community/youtube_logo.png differ diff --git a/assets/img/evolution/bigwallet.png b/assets/img/evolution/bigwallet.png new file mode 100755 index 0000000..61d7d9c Binary files /dev/null and b/assets/img/evolution/bigwallet.png differ diff --git a/assets/img/evolution/dashevolution.png b/assets/img/evolution/dashevolution.png new file mode 100755 index 0000000..61d7d9c Binary files /dev/null and b/assets/img/evolution/dashevolution.png differ diff --git a/assets/img/merchants/AboveAllHousePlants.jpg b/assets/img/merchants/AboveAllHousePlants.jpg index 219752a..99d39dc 100644 Binary files a/assets/img/merchants/AboveAllHousePlants.jpg and b/assets/img/merchants/AboveAllHousePlants.jpg differ diff --git a/assets/img/merchants/AirVPN.jpg b/assets/img/merchants/AirVPN.jpg index 1629d9d..ceb601e 100644 Binary files a/assets/img/merchants/AirVPN.jpg and b/assets/img/merchants/AirVPN.jpg differ diff --git a/assets/img/merchants/BitStickers.jpg b/assets/img/merchants/BitStickers.jpg index c0bd8e6..c6aa562 100644 Binary files a/assets/img/merchants/BitStickers.jpg and b/assets/img/merchants/BitStickers.jpg differ diff --git a/assets/img/merchants/BitcoinSeedStore.jpg b/assets/img/merchants/BitcoinSeedStore.jpg index d95ef40..04c4e33 100644 Binary files a/assets/img/merchants/BitcoinSeedStore.jpg and b/assets/img/merchants/BitcoinSeedStore.jpg differ diff --git a/assets/img/merchants/Bitfon.jpg b/assets/img/merchants/Bitfon.jpg index 1d06607..3cebed3 100644 Binary files a/assets/img/merchants/Bitfon.jpg and b/assets/img/merchants/Bitfon.jpg differ diff --git a/assets/img/merchants/Bitgild.jpg b/assets/img/merchants/Bitgild.jpg index 8dac629..de83173 100644 Binary files a/assets/img/merchants/Bitgild.jpg and b/assets/img/merchants/Bitgild.jpg differ diff --git a/assets/img/merchants/Bitlaser.jpg b/assets/img/merchants/Bitlaser.jpg index a699546..e472362 100644 Binary files a/assets/img/merchants/Bitlaser.jpg and b/assets/img/merchants/Bitlaser.jpg differ diff --git a/assets/img/merchants/Bitwala.jpg b/assets/img/merchants/Bitwala.jpg index 26e5f98..38f7eaa 100644 Binary files a/assets/img/merchants/Bitwala.jpg and b/assets/img/merchants/Bitwala.jpg differ diff --git a/assets/img/merchants/BolehVPN.jpg b/assets/img/merchants/BolehVPN.jpg index 213f5b5..f8eb7cb 100644 Binary files a/assets/img/merchants/BolehVPN.jpg and b/assets/img/merchants/BolehVPN.jpg differ diff --git a/assets/img/merchants/BraveNewBooks.jpg b/assets/img/merchants/BraveNewBooks.jpg index 10c7488..7f33370 100644 Binary files a/assets/img/merchants/BraveNewBooks.jpg and b/assets/img/merchants/BraveNewBooks.jpg differ diff --git a/assets/img/merchants/ClawsMail.jpg b/assets/img/merchants/ClawsMail.jpg index b3b7cfa..fa72eb8 100644 Binary files a/assets/img/merchants/ClawsMail.jpg and b/assets/img/merchants/ClawsMail.jpg differ diff --git a/assets/img/merchants/CoinWars.jpg b/assets/img/merchants/CoinWars.jpg index 1e179a3..86f6b0d 100644 Binary files a/assets/img/merchants/CoinWars.jpg and b/assets/img/merchants/CoinWars.jpg differ diff --git a/assets/img/merchants/Cryfter.jpg b/assets/img/merchants/Cryfter.jpg index 4c790c1..d830f6f 100644 Binary files a/assets/img/merchants/Cryfter.jpg and b/assets/img/merchants/Cryfter.jpg differ diff --git a/assets/img/merchants/CryptoGames.jpg b/assets/img/merchants/CryptoGames.jpg index e367c54..7df3acc 100644 Binary files a/assets/img/merchants/CryptoGames.jpg and b/assets/img/merchants/CryptoGames.jpg differ diff --git a/assets/img/merchants/CryptoPet.jpg b/assets/img/merchants/CryptoPet.jpg index bacadab..037a0f7 100644 Binary files a/assets/img/merchants/CryptoPet.jpg and b/assets/img/merchants/CryptoPet.jpg differ diff --git a/assets/img/merchants/CryptodeChange.jpg b/assets/img/merchants/CryptodeChange.jpg index 37d544c..6092961 100644 Binary files a/assets/img/merchants/CryptodeChange.jpg and b/assets/img/merchants/CryptodeChange.jpg differ diff --git a/assets/img/merchants/DeMadera.jpg b/assets/img/merchants/DeMadera.jpg index a679d3b..736d14a 100644 Binary files a/assets/img/merchants/DeMadera.jpg and b/assets/img/merchants/DeMadera.jpg differ diff --git a/assets/img/merchants/DirectBet.jpg b/assets/img/merchants/DirectBet.jpg index e7113ee..30ff2e8 100644 Binary files a/assets/img/merchants/DirectBet.jpg and b/assets/img/merchants/DirectBet.jpg differ diff --git a/assets/img/merchants/Ecigarttes.jpg b/assets/img/merchants/Ecigarttes.jpg index ca0c7d2..60e6c14 100644 Binary files a/assets/img/merchants/Ecigarttes.jpg and b/assets/img/merchants/Ecigarttes.jpg differ diff --git a/assets/img/merchants/EtherDesign.jpg b/assets/img/merchants/EtherDesign.jpg index e225a50..4e57d52 100644 Binary files a/assets/img/merchants/EtherDesign.jpg and b/assets/img/merchants/EtherDesign.jpg differ diff --git a/assets/img/merchants/FXLucky.jpg b/assets/img/merchants/FXLucky.jpg index cad91c1..3a0c36f 100644 Binary files a/assets/img/merchants/FXLucky.jpg and b/assets/img/merchants/FXLucky.jpg differ diff --git a/assets/img/merchants/FlokiNet.jpg b/assets/img/merchants/FlokiNet.jpg index 6658fbb..3d132ca 100644 Binary files a/assets/img/merchants/FlokiNet.jpg and b/assets/img/merchants/FlokiNet.jpg differ diff --git a/assets/img/merchants/FortGalt.jpg b/assets/img/merchants/FortGalt.jpg index 6f84928..ec1c0ed 100644 Binary files a/assets/img/merchants/FortGalt.jpg and b/assets/img/merchants/FortGalt.jpg differ diff --git a/assets/img/merchants/FortuneJack.jpg b/assets/img/merchants/FortuneJack.jpg index c424095..5548bec 100644 Binary files a/assets/img/merchants/FortuneJack.jpg and b/assets/img/merchants/FortuneJack.jpg differ diff --git a/assets/img/merchants/GiftOff.jpg b/assets/img/merchants/GiftOff.jpg index 8c97125..a30d5fc 100644 Binary files a/assets/img/merchants/GiftOff.jpg and b/assets/img/merchants/GiftOff.jpg differ diff --git a/assets/img/merchants/Healthiverse.jpg b/assets/img/merchants/Healthiverse.jpg index fb94498..18ebda9 100644 Binary files a/assets/img/merchants/Healthiverse.jpg and b/assets/img/merchants/Healthiverse.jpg differ diff --git a/assets/img/merchants/LiborioLawOffice.jpg b/assets/img/merchants/LiborioLawOffice.jpg index 70bef5e..2700c1f 100644 Binary files a/assets/img/merchants/LiborioLawOffice.jpg and b/assets/img/merchants/LiborioLawOffice.jpg differ diff --git a/assets/img/merchants/MultiVPN.jpg b/assets/img/merchants/MultiVPN.jpg index 748c616..9af0947 100644 Binary files a/assets/img/merchants/MultiVPN.jpg and b/assets/img/merchants/MultiVPN.jpg differ diff --git a/assets/img/merchants/Nestorgames.jpg b/assets/img/merchants/Nestorgames.jpg index 7cffd23..672211c 100644 Binary files a/assets/img/merchants/Nestorgames.jpg and b/assets/img/merchants/Nestorgames.jpg differ diff --git a/assets/img/merchants/OcculusOmega.png b/assets/img/merchants/OcculusOmega.png index 886f1a7..346df4e 100644 Binary files a/assets/img/merchants/OcculusOmega.png and b/assets/img/merchants/OcculusOmega.png differ diff --git a/assets/img/merchants/PartyCakesforYou.jpg b/assets/img/merchants/PartyCakesforYou.jpg index c366ff5..891cf51 100644 Binary files a/assets/img/merchants/PartyCakesforYou.jpg and b/assets/img/merchants/PartyCakesforYou.jpg differ diff --git a/assets/img/merchants/PexPepper.jpg b/assets/img/merchants/PexPepper.jpg index 4ff875b..9c08484 100644 Binary files a/assets/img/merchants/PexPepper.jpg and b/assets/img/merchants/PexPepper.jpg differ diff --git a/assets/img/merchants/PhilippEngelhornPhotography.jpg b/assets/img/merchants/PhilippEngelhornPhotography.jpg index ebb6e97..e0f5aac 100644 Binary files a/assets/img/merchants/PhilippEngelhornPhotography.jpg and b/assets/img/merchants/PhilippEngelhornPhotography.jpg differ diff --git a/assets/img/merchants/PremiumGiftCards.png b/assets/img/merchants/PremiumGiftCards.png index 63f733f..18f2e38 100644 Binary files a/assets/img/merchants/PremiumGiftCards.png and b/assets/img/merchants/PremiumGiftCards.png differ diff --git a/assets/img/merchants/RetroTowers.jpg b/assets/img/merchants/RetroTowers.jpg index 6693532..c95f075 100644 Binary files a/assets/img/merchants/RetroTowers.jpg and b/assets/img/merchants/RetroTowers.jpg differ diff --git a/assets/img/merchants/SeedStuff.jpg b/assets/img/merchants/SeedStuff.jpg index b9f5f77..1406286 100644 Binary files a/assets/img/merchants/SeedStuff.jpg and b/assets/img/merchants/SeedStuff.jpg differ diff --git a/assets/img/merchants/SeymourLocksmith.jpg b/assets/img/merchants/SeymourLocksmith.jpg index f0bfc1f..ca2a3d7 100644 Binary files a/assets/img/merchants/SeymourLocksmith.jpg and b/assets/img/merchants/SeymourLocksmith.jpg differ diff --git a/assets/img/merchants/SpectroCoin.jpg b/assets/img/merchants/SpectroCoin.jpg index be04d2b..3bb99e9 100644 Binary files a/assets/img/merchants/SpectroCoin.jpg and b/assets/img/merchants/SpectroCoin.jpg differ diff --git a/assets/img/merchants/StrippedClean.jpg b/assets/img/merchants/StrippedClean.jpg index 752bfde..a146949 100644 Binary files a/assets/img/merchants/StrippedClean.jpg and b/assets/img/merchants/StrippedClean.jpg differ diff --git a/assets/img/merchants/TalismanApts.jpg b/assets/img/merchants/TalismanApts.jpg index 49a23c8..60cf690 100644 Binary files a/assets/img/merchants/TalismanApts.jpg and b/assets/img/merchants/TalismanApts.jpg differ diff --git a/assets/img/merchants/TheReefShop.jpg b/assets/img/merchants/TheReefShop.jpg index 59dd24f..930c62d 100644 Binary files a/assets/img/merchants/TheReefShop.jpg and b/assets/img/merchants/TheReefShop.jpg differ diff --git a/assets/img/merchants/UQUID.jpg b/assets/img/merchants/UQUID.jpg index b0223eb..202ca42 100644 Binary files a/assets/img/merchants/UQUID.jpg and b/assets/img/merchants/UQUID.jpg differ diff --git a/assets/img/merchants/VikingVPN.jpg b/assets/img/merchants/VikingVPN.jpg index 621af80..f3fe2c3 100644 Binary files a/assets/img/merchants/VikingVPN.jpg and b/assets/img/merchants/VikingVPN.jpg differ diff --git a/assets/img/merchants/Wirex.jpg b/assets/img/merchants/Wirex.jpg index 510d300..be2e2ac 100644 Binary files a/assets/img/merchants/Wirex.jpg and b/assets/img/merchants/Wirex.jpg differ diff --git a/assets/img/merchants/Yipptee.jpg b/assets/img/merchants/Yipptee.jpg index c7aa5ed..f5a3361 100644 Binary files a/assets/img/merchants/Yipptee.jpg and b/assets/img/merchants/Yipptee.jpg differ diff --git a/assets/img/merchants/bolehvpn.png b/assets/img/merchants/bolehvpn.png index 119eb4c..ad927d8 100644 Binary files a/assets/img/merchants/bolehvpn.png and b/assets/img/merchants/bolehvpn.png differ diff --git a/assets/img/merchants/bravenewbooks_logo.png b/assets/img/merchants/bravenewbooks_logo.png index dec6dd6..010bb4b 100644 Binary files a/assets/img/merchants/bravenewbooks_logo.png and b/assets/img/merchants/bravenewbooks_logo.png differ diff --git a/assets/img/merchants/coaex_logo.png b/assets/img/merchants/coaex_logo.png index 0e46b02..eec97b7 100644 Binary files a/assets/img/merchants/coaex_logo.png and b/assets/img/merchants/coaex_logo.png differ diff --git a/assets/img/merchants/giftoff_logo.png b/assets/img/merchants/giftoff_logo.png index a903795..b548057 100644 Binary files a/assets/img/merchants/giftoff_logo.png and b/assets/img/merchants/giftoff_logo.png differ diff --git a/assets/img/merchants/isfx.jpg b/assets/img/merchants/isfx.jpg index 7a49edf..deffd8e 100644 Binary files a/assets/img/merchants/isfx.jpg and b/assets/img/merchants/isfx.jpg differ diff --git a/assets/img/merchants/isg3d_logo.png b/assets/img/merchants/isg3d_logo.png index ef964fd..2d0bf23 100644 Binary files a/assets/img/merchants/isg3d_logo.png and b/assets/img/merchants/isg3d_logo.png differ diff --git a/assets/img/merchants/key4coin_logo.png b/assets/img/merchants/key4coin_logo.png index 4595959..6187c3d 100644 Binary files a/assets/img/merchants/key4coin_logo.png and b/assets/img/merchants/key4coin_logo.png differ diff --git a/assets/img/merchants/livingroomofsatoshi_logo.png b/assets/img/merchants/livingroomofsatoshi_logo.png index 90348fc..0f6073b 100644 Binary files a/assets/img/merchants/livingroomofsatoshi_logo.png and b/assets/img/merchants/livingroomofsatoshi_logo.png differ diff --git a/assets/img/merchants/misconductwine_logo.jpg b/assets/img/merchants/misconductwine_logo.jpg index 33f81e6..89b1e50 100644 Binary files a/assets/img/merchants/misconductwine_logo.jpg and b/assets/img/merchants/misconductwine_logo.jpg differ diff --git a/assets/img/merchants/node40.png b/assets/img/merchants/node40.png index 1b71a04..30a502c 100644 Binary files a/assets/img/merchants/node40.png and b/assets/img/merchants/node40.png differ diff --git a/assets/img/merchants/protonmail.png b/assets/img/merchants/protonmail.png index 20b19bc..3ca3a7d 100644 Binary files a/assets/img/merchants/protonmail.png and b/assets/img/merchants/protonmail.png differ diff --git a/assets/img/merchants/qhoster.png b/assets/img/merchants/qhoster.png index ac00ed0..f98fc6c 100644 Binary files a/assets/img/merchants/qhoster.png and b/assets/img/merchants/qhoster.png differ diff --git a/assets/img/merchants/shakepay_logo.png b/assets/img/merchants/shakepay_logo.png index 2f4471d..6afe69b 100644 Binary files a/assets/img/merchants/shakepay_logo.png and b/assets/img/merchants/shakepay_logo.png differ diff --git a/assets/img/merchants/shapeshift_logo.png b/assets/img/merchants/shapeshift_logo.png index 79a595d..6104875 100644 Binary files a/assets/img/merchants/shapeshift_logo.png and b/assets/img/merchants/shapeshift_logo.png differ diff --git a/assets/img/team/raico.jpg b/assets/img/team/raico.jpg new file mode 100644 index 0000000..21624c4 Binary files /dev/null and b/assets/img/team/raico.jpg differ diff --git a/evolution/index.html b/evolution/index.html index 1b9ffc4..9f01d03 100755 --- a/evolution/index.html +++ b/evolution/index.html @@ -1,7 +1,7 @@ --- layout: default -title: pages.home.title -description: pages.home.description +title: pages.evolution.title +description: pages.evolution.description --- @@ -15,12 +15,12 @@ description: pages.home.description -->
-

{% t pages.home.video-heading %}

-
{% tmd pages.home.video-text %}
+

{% t pages.evolution.video-heading %}

+
{% tmd pages.evolution.video-text %}
- {% t pages.home.video-btn %} - {% t nav.download %} + {% t pages.evolution.video-btn %} + {% t pages.evolution.sentinel-btn %}
@@ -28,156 +28,95 @@ description: pages.home.description + +
+
+

{% t pages.evolution.prototype-heading %}

+ + {% tmd pages.evolution.prototype-text %} + + {% t pages.evolution.prototype-btn %} + + +
+
+ +
-

{% t pages.home.merchants-heading %}

+

{% t pages.update.integrate-heading %}

- {% tmd pages.home.merchants-text %} + {% tmd pages.update.integrate-text %}
-
+
- - - - - - - @@ -185,8 +124,8 @@ description: pages.home.description
- {% t pages.home.merchants-btn %} - {% t pages.home.merchants-join-btn %} + {% t pages.update.slack-btn %} + {% t pages.update.forum-btn %}
@@ -224,14 +163,14 @@ description: pages.home.description
-

{% t pages.home.architecture-heading %}

+

{% t pages.update.execution-heading %}

- {% tmd pages.home.architecture-text %} + {% tmd pages.update.execution-text %} - {% t pages.home.architecture-btn %} + {% t pages.update.execution-btn %}
- {% t pages.home.architecture-heading %} + {% t pages.home.execution-heading %}
@@ -244,16 +183,13 @@ description: pages.home.description
-

{% t pages.home.governance-heading%}

+

{% t pages.update.update-heading %}

- {% tmd pages.home.governance-text %} + {% tmd pages.update.update-text %} - {% t pages.home.proposal-btn %} - - {% t pages.home.proposal-submit-btn %}
-
- {% t pages.home.governance-heading%} +
+ {% t pages.update.update-heading %}
@@ -266,17 +202,14 @@ description: pages.home.description
-

{% t pages.home.network-growth-heading %}

+

{% t pages.update.evolution-research-heading %}

- {% tmd pages.home.network-growth-text %} + {% tmd pages.update.evolution-research-text %} - {% t pages.home.network-growth-btn %} + {% t pages.update.evolution-research-btn %}
-
- {% t pages.home.network-growth-heading %} + {% t pages.update.research-heading %}
@@ -289,14 +222,14 @@ description: pages.home.description
-

{% t pages.home.evolution-heading %}

+

{% t pages.update.launching-heading %}

- {% tmd pages.home.evolution-text %} + {% tmd pages.update.launching-text %} - {% t pages.home.evolution-btn %} + {% t pages.update.launching-btn %}
- Dash Evolution + Dash Evolution
@@ -335,19 +268,5 @@ description: pages.home.description
- -
-
-

{% t pages.home.get-started-heading %}

- - {% tmd pages.home.get-started-text %} - - {% t pages.home.get-started-btn %} - - -
-
diff --git a/src/scss/_junk-drawer.scss b/src/scss/_junk-drawer.scss index 843fffc..e1a97a4 100644 --- a/src/scss/_junk-drawer.scss +++ b/src/scss/_junk-drawer.scss @@ -255,18 +255,18 @@ a.blog_link { background-image: url(../../assets/img/update/bg2.png); color: white; padding: 40px 0; - overflow: hidden; - position: relative; - text-align: center; + overflow: hidden; + position: relative; + text-align: center; h1, h2, h3 { color: white; } h2 { - margin-top: 0px; + margin-top: 0px; } .page--home>section:not(.section) p { - max-width: 50em; - margin: 20px auto; + max-width: 50em; + margin: 20px auto; } img { margin-top: 30px; @@ -280,12 +280,16 @@ a.blog_link { .ctabox_small-font{ p{ padding-left: 20px; - padding-right: 20px; - font-size: 0.8em; - height: 100%; - word-wrap: normal; - white-space: normal; - line-height: 1.3; - text-align: left; + padding-right: 20px; + font-size: 0.8em; + height: 100%; + word-wrap: normal; + white-space: normal; + line-height: 1.3; + text-align: left; } } + +.evo-prototype-section{ + background-image: url(../../assets/img/evolution/bg2.png); +}