diff --git a/_data/team.yml b/_data/team.yml index d8737cc..ffb3305 100755 --- a/_data/team.yml +++ b/_data/team.yml @@ -73,7 +73,7 @@ description: Andy has 17 years experience as a developer and 12 years as a CTO in the E-commerce, Web, SaaS, ERP, P2P streaming, Supply Chain and Games spaces. image: andy_f.png email: andy@dash.org - keybase: + keybase: https://keybase.io/andyfreer twitter: core-team: true diff --git a/_data/wallets-collection.yml b/_data/wallets-collection.yml index c20c7e5..3879ad3 100644 --- a/_data/wallets-collection.yml +++ b/_data/wallets-collection.yml @@ -1,55 +1,3 @@ -- name: "Dash Core Win/32 Installer" - description: Dash Core QT Wallet (All Features incl IS, PS, ....) - logo_url: /assets/img/dash_circle_normal.png - os: win32 - type: desktop - vendor_id: dash_core - vendor_label: Dash Core - product_id: dash_core_win_32_install - product_label: Dash Core - product_security_label: "https://www.dash.org" - product_security_url: "https://www.dash.org" - product_website_label: Dash.org - product_website_url: "https://www.dash.org" - product_source_label: Github - product_source_url: "https://github.com/dashpay/dash" - links:
 - - - label: Download Installer
 - url: "https://www.dash.org/binaries/dash-0.12.0.58-win32-setup.exe"
 - -
 - label: Hash File
 - url: "https://github.com/dashpay/dash/releases/download/v0.12.0.58/SHA256SUMS.asc"
 - -
 - label: PGP
 - url: "https://www.dash.org/binaries/dash-0.12.0.58-win32-setup.exe.asc" - -- name: "Dash Core Win/32 ZIP" - description: Dash Core QT Wallet (All Features incl IS, PS, ....) - logo_url: /assets/img/dash_circle_normal.png - os: win32 - type: desktop - vendor_id: dash_core - vendor_label: Dash Core - product_id: dash_core_win_32_zip - product_label: Dash Core Win/32 ZIP - product_security_label: "https://www.dash.org" - product_security_url: "https://www.dash.org" - product_website_label: Dash.org - product_website_url: "https://www.dash.org" - product_source_label: Github - product_source_url: "https://github.com/dashpay/dash" - links: - - - label: Download ZIP - url: "https://www.dash.org/binaries/dash-0.12.0.58-win32.zip" - - - label: Hash File - url: "https://github.com/dashpay/dash/releases/download/v0.12.0.58/SHA256SUMS.asc" - - - label: PGP - url: "https://www.dash.org/binaries/dash-0.12.0.58-win32.zip.asc" - - name: "Dash Core Win/64 Installer" description: Dash Core QT Wallet (All Features incl IS, PS, ....) logo_url: /assets/img/dash_circle_normal.png @@ -68,13 +16,13 @@ links: - label: Download Installer - url: "https://www.dash.org/binaries/dash-0.12.0.58-win64-setup.exe" + url: "/binaries/dash-0.12.1.0-win64-setup.exe" - label: Hash File - url: "https://github.com/dashpay/dash/releases/download/v0.12.0.58/SHA256SUMS.asc" + url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" - label: PGP - url: "https://www.dash.org/binaries/dash-0.12.0.58-win64-setup.exe.asc" + url: "/binaries/dash-0.12.1.0-win64-setup.exe.asc" - name: Dash Core Win/64 ZIP description: Dash Core QT Wallet (All Features incl IS, PS, ....) @@ -94,14 +42,65 @@ links: - label: Download ZIP - url: "https://www.dash.org/binaries/dash-0.12.0.58-win32.zip.asc" + url: "/binaries/dash-0.12.1.0-win64.zip" - label: Hash File - url: "https://github.com/dashpay/dash/releases/download/v0.12.0.58/SHA256SUMS.asc" + url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" - label: PGP - url: "https://www.dash.org/binaries/dash-0.12.0.58-win64.zip.asc" + url: "/binaries/dash-0.12.1.0-win64.zip.asc" +- name: "Dash Core Win/32 Installer" + description: Dash Core QT Wallet (All Features incl IS, PS, ....) + logo_url: /assets/img/dash_circle_normal.png + os: win32 + type: desktop + vendor_id: dash_core + vendor_label: Dash Core + product_id: dash_core_win_32_install + product_label: Dash Core + product_security_label: "https://www.dash.org" + product_security_url: "https://www.dash.org" + product_website_label: Dash.org + product_website_url: "https://www.dash.org" + product_source_label: Github + product_source_url: "https://github.com/dashpay/dash" + links: + - + label: Download Installer + url: "/binaries/dash-0.12.1.0-win32-setup.exe" + -
 + label: Hash File + url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" + -
 + label: PGP + url: "/binaries/dash-0.12.1.0-win32-setup.exe.asc" + +- name: "Dash Core Win/32 ZIP" + description: Dash Core QT Wallet (All Features incl IS, PS, ....) + logo_url: /assets/img/dash_circle_normal.png + os: win32 + type: desktop + vendor_id: dash_core + vendor_label: Dash Core + product_id: dash_core_win_32_zip + product_label: Dash Core Win/32 ZIP + product_security_label: "https://www.dash.org" + product_security_url: "https://www.dash.org" + product_website_label: Dash.org + product_website_url: "https://www.dash.org" + product_source_label: Github + product_source_url: "https://github.com/dashpay/dash" + links: + - + label: Download ZIP + url: "/binaries/dash-0.12.1.0-win32.zip" + - + label: Hash File + url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" + - + label: PGP + url: "/binaries/dash-0.12.1.0-win32.zip.asc" - name: Dash Core Linux 32 Bit description: Dash Core QT Wallet (All Features incl IS, PS, ....) @@ -121,13 +120,13 @@ links: - label: Download TGZ - url: "https://www.dash.org/binaries/dash-0.12.0.58-linux32.tar.gz" + url: "/binaries/dash-0.12.1.0-linux32.tar.gz" - label: Hash File - url: "https://github.com/dashpay/dash/releases/download/v0.12.0.58/SHA256SUMS.asc" + url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" - label: PGP - url: "https://www.dash.org/binaries/dash-0.12.0.58-linux32.tar.gz.asc" + url: "/binaries/dash-0.12.1.0-linux32.tar.gz.asc" - name: Dash Core Linux 64 Bit description: Dash Core QT Wallet (All Features incl IS, PS, ....) @@ -147,13 +146,13 @@ links: - label: Download TGZ - url: "https://www.dash.org/binaries/dash-0.12.0.58-linux64.tar.gz" + url: "/binaries/dash-0.12.1.0-linux64.tar.gz" - label: Hash File - url: "https://github.com/dashpay/dash/releases/download/v0.12.0.58/SHA256SUMS.asc" + url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" - label: PGP - url: "https://www.dash.org/binaries/dash-0.12.0.58-linux64.tar.gz.asc" + url: "/binaries/dash-0.12.1.0-linux64.tar.gz.asc" - name: Dash Core Raspberry Pi 2 description: Dash Core QT Wallet (All Features incl IS, PS, ....) @@ -173,13 +172,13 @@ links: - label: Download TGZ - url: "https://www.dash.org/binaries/dash-0.12.0.58-RPi2.tar.gz" + url: "/binaries/dash-0.12.1.0-RPi2.tar.gz" - label: Hash File - url: "https://github.com/dashpay/dash/releases/download/v0.12.0.58/SHA256SUMS.asc" + url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" - label: PGP - url: "https://www.dash.org/binaries/dash-0.12.0.58-RPi2.tar.gz.asc" + url: "/binaries/dash-0.12.1.0-RPi2.tar.gz.asc" - name: Dash Electrum 32/64bit description: Dash Core "Light" Wallet (No Features) @@ -202,10 +201,10 @@ url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin" - label: Hash File - url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.DIGESTS.txt" + url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.DIGESTS.txt" - label: PGP - url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.asc" + url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.asc" - name: Dash Electrum 32/64bit description: Dash Core "Light" Wallet (No Features) @@ -225,13 +224,13 @@ links: - label: Download - url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Windows-setup.exe" + url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe" - label: Hash File - url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt" + url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt" - label: PGP - url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc" + url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc" - name: Dash Electrum 32/64bit description: Dash Core "Light" Wallet (No Features) @@ -251,13 +250,13 @@ links: - label: Download - url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Windows-setup.exe" + url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe" - label: Hash File - url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt" + url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt" - label: PGP - url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc" + url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc" - name: Jaxx description: | @@ -332,13 +331,13 @@ links: - label: Download DMG - url: "https://www.dash.org/binaries/dash-0.12.0.58-osx.dmg" + url: "/binaries/dash-0.12.1.0-osx.dmg" - label: Hash File - url: "https://github.com/dashpay/dash/releases/download/v0.12.0.58/SHA256SUMS.asc" + url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" - - label: pgp - url: "https://www.dash.org/binaries/dash-0.12.0.58-osx.dmg.asc" + label: PGP + url: "/binaries/dash-0.12.1.0-osx.dmg.asc" - name: Dash Electrum description: Dash Core "Light" Wallet (No Features incl IS, PS, ....) @@ -356,13 +355,13 @@ links: - label: Download PKG - url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Installer.pkg" + url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg" - label: Hash File - url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Installer.pkg.DIGESTS.txt" + url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.DIGESTS.txt" - label: PGP - url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Installer.pkg.asc" + url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.asc" - name: Jaxx description: | diff --git a/_i18n/en.yml b/_i18n/en.yml index cf7bf30..2ba465a 100755 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -2,6 +2,67 @@ # For multiple paragraph content add two line breaks pages: + woocommerce: + title: Dash Official Website | Dash Crypto Currency + description: Dash is Digital Cash + + hero-heading: WooCommerce + hero-text: WooCommerce is a free eCommerce plugin that allows you to sell anything, beautifully. Built to integrate seamlessly with WordPress, WooCommerce is the world’s favorite eCommerce solution that gives both store owners and developers complete control. + + hero-btn: Github Repo + hero-btn-download: Zip download + hero-description: Please make sure your site meets + hero-description-link: the technical requirements + + plugin-heading: > + What is Plugin: + plugin-text: Three GoUrl Payment Integration Options for WooCommerce + + 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. + + video-heading: + video-btn: Woocommerce Overview Video + + install-heading: WordPress DashSetupvideo + install-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. + install-btn: Learn More + + how-heading: How to + how-link: MANUAL PLUGIN INSTALLATION + how-text: > + There are a few cases when manually installing a WordPress Plugin is appropriate. + + If you wish to control the placement and process of installing a WordPress Plugin. + + If your server does not permit automatic installation of a WordPress Plugin. + + The WordPress Plugin is not in the WordPress Plugins Directory. + + Installation of a WordPress Plugin manually requires FTP familiarity and the awareness that you may put your site at risk if you install a WordPress Plugin incompatible with the current version or from an unreliable source. + + Backup your site completely before proceeding. + + To install a WordPress Plugin manually: + + + Download your WordPress Plugin to your desktop. + If downloaded as a zip archive, extract the Plugin folder to your desktop. + Read through the "readme" file thoroughly to ensure you follow the installation instructions. + With your FTP program, upload the Plugin folder to the wp-content/plugins folder in your WordPress directory online. + how-text-plugin: screen and find the newly uploaded Plugin in the list. + Click Activate to activate it. + Check the Details readme file for customization and further instructions. + how-text-link: Go to Plugin + graphics: title: Dash Official Website | Dash Crypto Currency description: Dash is Digital Cash @@ -132,11 +193,9 @@ pages: masternodes-btn: Masternodes exchanges-btn: Exchanges - integrate-heading: Dash Evolution Progress - 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 + proposal-heading: Proposal Automated Service + proposal-text: + proposal-btn: Learn more execution-heading: What is Evolution execution-text: @@ -231,7 +290,7 @@ pages: description: Dash is Digital Cash hero-image: hero-heading: Dash is Digital Cash - hero-text: The first truly-decentralized digital money system.
Meet Digital Cash. + hero-text: A revolutionary digital money system.
Meet Digital Cash. video-heading: Dash is Digital Cash You Can Spend Online video-text: Use Dash to make instant, private payments online or in-store using our secure open-source platform hosted by thousands of users around the world. @@ -503,6 +562,7 @@ nav: shop: Shop with Dash debit: Dash Debit Card update: Update + evolution: Evolution participate: Contribute mining: Start Mining diff --git a/_i18n/en/_posts/2017-02-05-ATM.md b/_i18n/en/_posts/2017-02-05-ATM.md new file mode 100644 index 0000000..f7bfcf9 --- /dev/null +++ b/_i18n/en/_posts/2017-02-05-ATM.md @@ -0,0 +1,12 @@ +--- +author: tungfa +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 + +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! + + diff --git a/_i18n/en/_posts/2017-02-05-pre12-1.md b/_i18n/en/_posts/2017-02-05-pre12-1.md new file mode 100644 index 0000000..5e22139 --- /dev/null +++ b/_i18n/en/_posts/2017-02-05-pre12-1.md @@ -0,0 +1,30 @@ +--- +author: tungfa +layout: post +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 . + +Mining pools + +The information needed to the upgrade is available at + +Masternodes + +New hardware requirements and upgrade guides will be available at + +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(public, cummunity-driven Slack, you can sign up here: + + + +-Official forum support section. - {% t pages.blog.search-btn %} + {% t pages.blog.community-news-btn %} diff --git a/_includes/hero/community.html b/_includes/hero/community.html index 35cac82..6fd98b1 100644 --- a/_includes/hero/community.html +++ b/_includes/hero/community.html @@ -16,6 +16,7 @@
{% t pages.community.hero-forum-btn %} + {% t nav.participate %}
diff --git a/_includes/hero/currency.html b/_includes/hero/currency.html index 645cbe5..51d3cde 100644 --- a/_includes/hero/currency.html +++ b/_includes/hero/currency.html @@ -1,6 +1,6 @@
- {% srcset hero/participate.jpg ppi:1,2 class="hero__background-image" %} + {% srcset hero/network.jpg ppi:1,2 class="hero__background-image" %} {% srcset_source width:1920 %} {% srcset_source width:960 %} {% endsrcset %} diff --git a/_includes/hero/evolution.html b/_includes/hero/evolution.html index 4d2080e..abedf05 100755 --- a/_includes/hero/evolution.html +++ b/_includes/hero/evolution.html @@ -1,5 +1,5 @@
-
+
{% srcset evolution/bg1.png ppi:1,2 class="hero__background-image" %} {% srcset_source width:1920 %} {% srcset_source width:1280 %} @@ -18,8 +18,8 @@

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

- {% t pages.evolution.hero-btn %} - {% t pages.evolution.subscribe-btn %} + {% t pages.evolution.hero-btn %} + {% t pages.evolution.subscribe-btn %}
diff --git a/_includes/hero/home.html b/_includes/hero/home.html index 5e2b8a6..aef3222 100644 --- a/_includes/hero/home.html +++ b/_includes/hero/home.html @@ -1,4 +1,4 @@ -
+
{% srcset hero/home.jpg ppi:1,2 class="hero__background-image" %} {% srcset_source width:1920 %} @@ -19,6 +19,7 @@
{% t nav.get-dash %} + 12.1 {% t nav.update %}
diff --git a/_includes/hero/wallets.html b/_includes/hero/wallets.html index 6886272..17d4300 100644 --- a/_includes/hero/wallets.html +++ b/_includes/hero/wallets.html @@ -1,14 +1,21 @@ -
-
+
+ + + +
+ + +
- {% include nav-desktop.html logo-color='black' %} + {% include nav-desktop.html %}
diff --git a/_includes/hero/woocommerce.html b/_includes/hero/woocommerce.html new file mode 100644 index 0000000..44a2b15 --- /dev/null +++ b/_includes/hero/woocommerce.html @@ -0,0 +1,28 @@ +
+
+ {% srcset hero/woocommerce.jpeg 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.woocommerce.hero-heading %}

+

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

+
+ {% t pages.woocommerce.hero-btn %} + {% t pages.woocommerce.hero-btn-download %} +
+

{% t pages.woocommerce.hero-description %} {% t pages.woocommerce.hero-description-link %}

+
+ + +
+
diff --git a/_includes/nav-desktop.html b/_includes/nav-desktop.html index bbe84dd..f2aca93 100644 --- a/_includes/nav-desktop.html +++ b/_includes/nav-desktop.html @@ -19,15 +19,13 @@
  • {% t nav.get-dash %}
  • {% t nav.merchants %}
  • {% t nav.currency %}
    • -
  • {% t nav.participate %}
  • {% t nav.community %}
  • {% t nav.team %}
  • {% t nav.blog %}
    • -
  • {% t nav.update %}
    • {% if page.layout != 'post' %}
  • - {{site.lang}} +
      diff --git a/_includes/nav-mobile.html b/_includes/nav-mobile.html index 9db84ee..0fad5b0 100644 --- a/_includes/nav-mobile.html +++ b/_includes/nav-mobile.html @@ -10,11 +10,9 @@
    • {% t nav.get-dash %}
    • {% t nav.merchants %}
    • {% t nav.currency %}
      • -
    • {% t nav.participate %}
    • {% t nav.community %}
    • {% t nav.team %}
    • {% t nav.blog %}
      • -
    • {% t nav.update %}
      • {% if page.layout != 'post' %}
    • diff --git a/assets/img/blog/12.1-2.png b/assets/img/blog/12.1-2.png new file mode 100644 index 0000000..de85ab3 Binary files /dev/null and b/assets/img/blog/12.1-2.png differ diff --git a/assets/img/blog/BringDashtoyourlocalATM.jpg b/assets/img/blog/BringDashtoyourlocalATM.jpg new file mode 100644 index 0000000..8f0bed9 Binary files /dev/null and b/assets/img/blog/BringDashtoyourlocalATM.jpg differ diff --git a/assets/img/evolution/bg1.png b/assets/img/evolution/bg1.png index 7248b88..2b00aa0 100755 Binary files a/assets/img/evolution/bg1.png and b/assets/img/evolution/bg1.png differ diff --git a/assets/img/hero/expecto_patronum.png b/assets/img/hero/expecto_patronum.png new file mode 100644 index 0000000..9c09e06 Binary files /dev/null and b/assets/img/hero/expecto_patronum.png differ diff --git a/assets/img/hero/network.jpg b/assets/img/hero/network.jpg new file mode 100644 index 0000000..252da91 Binary files /dev/null and b/assets/img/hero/network.jpg differ diff --git a/assets/img/hero/woocommerce.jpeg b/assets/img/hero/woocommerce.jpeg new file mode 100644 index 0000000..c2a1ab2 Binary files /dev/null and b/assets/img/hero/woocommerce.jpeg differ diff --git a/assets/img/update/Voting.png b/assets/img/update/Voting.png new file mode 100644 index 0000000..7fa6ff2 Binary files /dev/null and b/assets/img/update/Voting.png differ diff --git a/cibuild.sh b/cibuild.sh index 6ad9adf..d39e00a 100644 --- a/cibuild.sh +++ b/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\/.+$/ diff --git a/contact/index.html b/contact/index.html index 2ad336f..6dbb523 100644 --- a/contact/index.html +++ b/contact/index.html @@ -20,7 +20,7 @@ description: pages.contact.description
    • -
    +

    {% t pages.contact.mail-list-heading %}

    @@ -38,29 +38,29 @@ description: pages.contact.description @@ -72,7 +72,7 @@ description: pages.contact.description
    @@ -254,82 +254,82 @@ description: pages.contact.description +
    +
    +

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

    + {% t pages.community.youtube-btn %} +
    +
    +
    +
    +
    + + --> +
    +
    +
    + + -->
    diff --git a/evolution/index.html b/evolution/index.html index 744acdf..3068e34 100755 --- a/evolution/index.html +++ b/evolution/index.html @@ -21,7 +21,7 @@ description: pages.evolution.description
    {% t pages.evolution.video-btn %} - {% t pages.evolution.sentinel-btn %} + {% t pages.evolution.sentinel-btn %}
    @@ -42,118 +42,6 @@ description: pages.evolution.description
    - -
    -
    -
    -

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

    - - {% tmd pages.evolution.component-text %} -
    - -
    -
    - - - - - - - - -
    -
    - - -
    -
    - - diff --git a/index.html b/index.html index dad340d..e11291c 100644 --- a/index.html +++ b/index.html @@ -292,8 +292,7 @@ description: pages.home.description

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

    {% tmd pages.home.evolution-text %} - - {% t pages.home.evolution-btn %} + {% t pages.home.evolution-btn %}
    Dash Evolution diff --git a/network/index.html b/network/index.html index b1134f5..ff50bdf 100644 --- a/network/index.html +++ b/network/index.html @@ -42,6 +42,7 @@ description: pages.currency.description DashVoteTracker DashCentral DashNinja + Proposal Generator
    diff --git a/src/js/get-dash.js b/src/js/get-dash.js index cce834f..d26b171 100644 --- a/src/js/get-dash.js +++ b/src/js/get-dash.js @@ -93,7 +93,7 @@ if (_downloadButton && _downloadButton.length > 0) { if (_detectedWallet && _platform) { - _downloadButton.html(_detectedWallet.links[0].label + ': ' + _detectedWallet.name) + _downloadButton.html(_detectedWallet.name) .attr({ title: _platform.os.toString() }) diff --git a/src/scss/_junk-drawer.scss b/src/scss/_junk-drawer.scss index 6317825..edaca4d 100755 --- a/src/scss/_junk-drawer.scss +++ b/src/scss/_junk-drawer.scss @@ -141,7 +141,7 @@ $wallet-tile-hover-background-base-color: lighten($color-blue-light, 9); & .modal-header { - border-bottom: none; + border-bottom: 1px solid #e5e5e5; } &.dash-core { & .btn.btn-default { @@ -201,7 +201,6 @@ a.blog_link { background-color: $color-blue-dark; .dash-core & { background-color: #fff; - } } &:before { @@ -212,8 +211,9 @@ a.blog_link { } } &__title { - font-size: 2.6em; + font-size: 1.6em; margin-right: 45px; + padding-left: 25px; .dash-core & { color: #fff; } @@ -236,7 +236,7 @@ a.blog_link { .dash-core & { color: #fff; } - font-size: 1.5em; + font-size: 1.2em; } &__accent { .dash-core & { @@ -460,5 +460,6 @@ a.blog_link { } .ctabox__image { - background-color: rgba(173,219,255,0.1); + background-color: #fff; } + diff --git a/src/scss/pages/_home.scss b/src/scss/pages/_home.scss index e5a4713..edf7ede 100644 --- a/src/scss/pages/_home.scss +++ b/src/scss/pages/_home.scss @@ -72,7 +72,7 @@ $homeSectionPaddingTop: 80px; .home-architecture-graphic { > img { max-width: 100%; - box-shadow: -5px 0 10px transparentize($color-black,0.8); + box-shadow: none; border-radius: 8px 0 0 0; } } diff --git a/update/index.html b/update/index.html index b5c29e6..d194603 100755 --- a/update/index.html +++ b/update/index.html @@ -46,90 +46,19 @@ description: pages.update.description
    -

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

    - - {% tmd pages.update.integrate-text %} +

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

    +
    -
    -
    - - - - - - -
    -
    +
    diff --git a/wallets/index.html b/wallets/index.html index bccfd8f..c360d3e 100644 --- a/wallets/index.html +++ b/wallets/index.html @@ -6,7 +6,7 @@ description: pages.wallets.description {% include hero/wallets.html %} {% include modals/win-core.html %} -{% assign desktop-os-order-list = "win32,win64,osx,linux" | split: ','%} +{% assign desktop-os-order-list = "win64,win32,osx,linux" | split: ','%} {% assign desktop-os-collection = site.data.wallets-collection | where:"type","desktop" | group_by:"os" %} {% assign mobile-os-collection = site.data.wallets-collection | where:"type","mobile" | group_by:"os" %} {% assign product-collection = site.data.wallets-collection | group_by:"product_id" %} @@ -32,10 +32,10 @@ description: pages.wallets.description {% if os-sequence == wallet-group.name %}
  • {% case wallet-group.name %} + {% when 'win64' %} + Windows (64bit) {% when 'win32' %} Windows (32bit) - {% when 'win64' %} - Windows (64bit) {% when 'osx' %} OSX {% when 'linux' %} diff --git a/woocommerce/index.html b/woocommerce/index.html new file mode 100644 index 0000000..d7ac5d5 --- /dev/null +++ b/woocommerce/index.html @@ -0,0 +1,99 @@ +--- +layout: default +title: pages.woocommerce.title +description: pages.woocommerce.description +--- + + +{% include hero/woocommerce.html %} +{% include base.html %} + + +
    + + +
    +
    +

    {% t pages.woocommerce.plugin-heading %}

    +
    {% tmd pages.woocommerce.plugin-text %}
    +
    +
    + + +
    +
    +
    +
    + {% t pages.home.feature-instant-heading %} +

    {% t pages.woocommerce.feature-instant-heading %}

    + {% tmd pages.woocommerce.feature-instant-text %} +
    +
    + {% t pages.home.feature-private-heading %} +

    {% t pages.woocommerce.feature-private-heading %}

    + {% tmd pages.woocommerce.feature-private-text %} +
    +
    + {% t pages.home.feature-secure-heading %} +

    {% t pages.woocommerce.feature-secure-heading %}

    + {% tmd pages.woocommerce.feature-secure-text %} +
    +
    +
    +
    + +
    +
    +

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

    +     +
    +
    + + +
    +
    +
    +
    +

    {% t pages.woocommerce.how-heading %}

    +

    {% t pages.woocommerce.how-link %}

    +

    {% tmd pages.woocommerce.how-text %}

    +

    {% tmd pages.woocommerce.how-text-link %}{% tmd pages.woocommerce.how-text-plugin %}

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

    {% t pages.woocommerce.install-heading %}

    + {% tmd pages.woocommerce.install-text %} + + {% t pages.woocommerce.install-btn %} +
    +
    + {% t pages.home.execution-heading %} +
    +
    +
    +
    + + +