diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..0bee604 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.3.3 diff --git a/_data/team.yml b/_data/team.yml index 7cb5295..b2c4aaa 100755 --- a/_data/team.yml +++ b/_data/team.yml @@ -288,7 +288,7 @@ - name: prtfw title: FrontEnd Developer - description: prtfw is a reformed ex-VC and Financier turned coder, Start + FinTech Pro, usually hacking on AI/Machine-Learning projects, pilot, adventurer, polymath + nomad with mild ADHD + description: prtfw is a reformed ex-VC and Financier turned coder, Startup + FinTech Pro, usually hacking on AI/Machine-Learning projects, pilot, adventurer, polymath + nomad with mild ADHD image: prtfw.png email: mns_catdogmice@yahoo.ca keybase: https://keybase.io/longgamma_act diff --git a/_data/wallets-collection.yml b/_data/wallets-collection.yml index 5b7e010..c244d7f 100644 --- a/_data/wallets-collection.yml +++ b/_data/wallets-collection.yml @@ -182,83 +182,83 @@ label: PGP url: "/binaries/dashcore-0.12.1.0-RPi2.tar.gz.asc" -- name: Dash Electrum 32/64bit - description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems. - logo_url: /assets/img/wallets/electrum_banner.png - os: linux - type: desktop - vendor_id: electrum - vendor_label: Electrum - control_type: full - validation_type: spv - access_type: multi - product_id: dash_electrum - product_label: Dash Electrum - product_website_label: Electrum-Dash.org - product_website_url: "https://electrum-dash.org/" - product_source_url: "https://github.com/dashpay/electrum-dash" - links: - - - label: Download PKG - url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin" - - - label: Hash File - url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.DIGESTS.txt" - - - label: PGP - url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.asc" +#- name: Dash Electrum 32/64bit +# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems. +# logo_url: /assets/img/wallets/electrum_banner.png +# os: linux +# type: desktop +# vendor_id: electrum +# vendor_label: Electrum +# control_type: full +# validation_type: spv +# access_type: multi +# product_id: dash_electrum +# product_label: Dash Electrum +# product_website_label: Electrum-Dash.org +# product_website_url: "https://electrum-dash.org/" +# product_source_url: "https://github.com/dashpay/electrum-dash" +# links: +# - +# label: Download PKG +# url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin" +# - +# label: Hash File +# url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.DIGESTS.txt" +# - +# label: PGP +# url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.asc" -- name: Dash Electrum 32/64bit - description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems. - logo_url: /assets/img/wallets/electrum_banner.png - os: win32 - type: desktop - vendor_id: dash_core - vendor_label: Dash Core - control_type: full - validation_type: spv - access_type: multi - product_id: dash_electrum - product_label: Dash Electrum - product_website_label: Electrum-Dash.org - product_website_url: "https://electrum-dash.org/" - product_source_url: "https://github.com/dashpay/electrum-dash" - links: - - - label: Download - url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe" - - - label: Hash File - url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt" - - - label: PGP - url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc" +#- name: Dash Electrum 32/64bit +# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems. +# logo_url: /assets/img/wallets/electrum_banner.png +# os: win32 +# type: desktop +# vendor_id: dash_core +# vendor_label: Dash Core +# control_type: full +# validation_type: spv +# access_type: multi +# product_id: dash_electrum +# product_label: Dash Electrum +# product_website_label: Electrum-Dash.org +# product_website_url: "https://electrum-dash.org/" +# product_source_url: "https://github.com/dashpay/electrum-dash" +# links: +# - +# label: Download +# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe" +# - +# label: Hash File +# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt" +# - +# label: PGP +# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc" -- name: Dash Electrum 32/64bit - description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems. - logo_url: /assets/img/wallets/electrum_banner.png - os: win64 - type: desktop - vendor_id: dash_core - vendor_label: Dash Core - control_type: full - validation_type: spv - access_type: multi - product_id: dash_electrum - product_label: Dash Electrum - product_website_label: Electrum-Dash.org - product_website_url: "https://electrum-dash.org/" - product_source_url: "https://github.com/dashpay/electrum-dash" - links: - - - label: Download - url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe" - - - label: Hash File - url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt" - - - label: PGP - url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc" +#- name: Dash Electrum 32/64bit +# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems. +# logo_url: /assets/img/wallets/electrum_banner.png +# os: win64 +# type: desktop +# vendor_id: dash_core +# vendor_label: Dash Core +# control_type: full +# validation_type: spv +# access_type: multi +# product_id: dash_electrum +# product_label: Dash Electrum +# product_website_label: Electrum-Dash.org +# product_website_url: "https://electrum-dash.org/" +# product_source_url: "https://github.com/dashpay/electrum-dash" +# links: +# - +# label: Download +# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe" +# - +# label: Hash File +# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt" +# - +# label: PGP +# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc" - name: Jaxx description: | @@ -341,29 +341,29 @@ label: PGP url: "/binaries/dashcore-0.12.1.0-osx.dmg.asc" -- name: Dash Electrum - description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems. - logo_url: /assets/img/wallets/electrum_banner.png - os: osx - type: desktop - vendor_id: dash_core - vendor_label: Dash Core - control_type: full - validation_type: full - access_type: p2p - product_id: dash_electrum - product_label: Dash Electrum - product_source_url: "https://github.com/dashpay/electrum-dash" - links: - - - label: Download PKG - url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg" - - - label: Hash File - url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.DIGESTS.txt" - - - label: PGP - url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.asc" +#- name: Dash Electrum +# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems. +# logo_url: /assets/img/wallets/electrum_banner.png +# os: osx +# type: desktop +# vendor_id: dash_core +# vendor_label: Dash Core +# control_type: full +# validation_type: full +# access_type: p2p +# product_id: dash_electrum +# product_label: Dash Electrum +# product_source_url: "https://github.com/dashpay/electrum-dash" +# links: +# - +# label: Download PKG +# url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg" +# - +# label: Hash File +# url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.DIGESTS.txt" +# - +# label: PGP +# url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.asc" - name: Jaxx description: | diff --git a/_i18n/en.yml b/_i18n/en.yml index d905563..565a518 100755 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -287,9 +287,9 @@ pages: hero-image: hero-heading: Contact hero-text: - form-pretext: For technical support or troubleshooting with wallets, mining, or other general questions, please visit DashTalk or one of the many other community resources. - form-pretext-2: For other inquiries, use this link. - # form-pretext-2: For other inquiries, use this form. + form-pretext: | + For technical support or troubleshooting with wallets, mining, or other general questions, please visit DashTalk or one of the many other community resources. + form-pretext-2: For other inquiries, use this form. social-heading: Forums & Social Media mail-list-heading: Mailing List mail-list-text: Have trouble keeping up-to-date? Join our mailing list. diff --git a/_i18n/en/_posts/2017-02-06cryptonews12-1.md b/_i18n/en/_posts/2017-02-06-cryptonews12-1.md similarity index 96% rename from _i18n/en/_posts/2017-02-06cryptonews12-1.md rename to _i18n/en/_posts/2017-02-06-cryptonews12-1.md index ef8a718..9bac974 100644 --- a/_i18n/en/_posts/2017-02-06cryptonews12-1.md +++ b/_i18n/en/_posts/2017-02-06-cryptonews12-1.md @@ -1,8 +1,8 @@ --- author: tungfa layout: post -image: Instructions12-1.png -title: Dash Releases Software Upgrade in Sweeping Redesign +image: "Instructions12-1.png" +title: "Dash Releases Software Upgrade in Sweeping Redesign" --- Labeling it “its largest software upgrade ever”, Dash has released version 12.1, codenamed Sentinel, today. The anticipated update sets to path a wider redesign of Dash in its advent toward unveiling ‘Evolution’ a decentralized payments system and marketplace that Dash says will compete with the likes of PayPal and Venmo. diff --git a/_i18n/en/_posts/2017-02-09networkswitchvideo.md b/_i18n/en/_posts/2017-02-09-networkswitchvideo.md similarity index 99% rename from _i18n/en/_posts/2017-02-09networkswitchvideo.md rename to _i18n/en/_posts/2017-02-09-networkswitchvideo.md index e186a59..25bbbb3 100644 --- a/_i18n/en/_posts/2017-02-09networkswitchvideo.md +++ b/_i18n/en/_posts/2017-02-09-networkswitchvideo.md @@ -2,7 +2,7 @@ author: tungfa layout: post image: 2017-02-09networkswitchvideo.png -title: Network Switch, General Bytes, & Testnet Slots | DASH: Detailed +title: "Network Switch, General Bytes, & Testnet Slots : DASH| Detailed" --- @@ -11,3 +11,4 @@ And now for development updates.Lead developer of Dash, Evan Duffield, has publi Payment Week covers 12.1: well as Samburaj Das in CryptoCoins News.CryptoCoinNews covers 12.1: addition, Ryan Taylor also gave an interview on the Spanish YouTube channel Cripto Noticias. The verbiage is in English, the subtitles are in Spanish, just to be clear.CriptoNoticias interviews Ryan Taylor: + diff --git a/_i18n/en/_posts/2017-02-10100hrs after.md b/_i18n/en/_posts/2017-02-10-100hrs-after.md similarity index 63% rename from _i18n/en/_posts/2017-02-10100hrs after.md rename to _i18n/en/_posts/2017-02-10-100hrs-after.md index 7de0ee4..621f6cb 100644 --- a/_i18n/en/_posts/2017-02-10100hrs after.md +++ b/_i18n/en/_posts/2017-02-10-100hrs-after.md @@ -1,8 +1,8 @@ --- author: tungfa layout: post -image: 2017-02-10100hrs after.png -title: 100 hrs after Dash 12.1 Launch = 98% - 100% Miner Support ! +image: "2017-02-10100hrs after.png" +title: "100 hrs after Dash 12.1 Launch = 98% - 100% Miner Support !" --- 100 hrs after Dash 12.1 Launch = 98% - 100% Miner Support ! What a community - Tx to All ; ) diff --git a/_i18n/en/_posts/2017-02-11-ICEtotalgamingvideo.md b/_i18n/en/_posts/2017-02-11-ICEtotalgamingvideo.md new file mode 100644 index 0000000..af5622a --- /dev/null +++ b/_i18n/en/_posts/2017-02-11-ICEtotalgamingvideo.md @@ -0,0 +1,9 @@ +--- +author: tungfa +layout: post +image: "2017-02-11ICEtotalgamingvideo.png" +title: "Robert Wiecko from Dash at ICE Totally Gaming 2017" +--- +Dash presentation by Robert Wiecko and Coinfirm presentation by Maciej Ziolkowski at 2017 ICE Totally Gaming conference (8th February 2017). + + diff --git a/_includes/hero/contact.html b/_includes/hero/contact.html index 5876f0f..b53541f 100644 --- a/_includes/hero/contact.html +++ b/_includes/hero/contact.html @@ -13,48 +13,53 @@

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

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

-
-
- {% t pages.contact.form-pretext %}
- {% t pages.contact.form-pretext-2 %} - Contact us. -
-
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
+
-
- - +
+ {% t pages.contact.form-pretext %}
+ {% t pages.contact.form-pretext-2 %} + + +
+
+
+
+ + + +
+
+
+ Dash
+ 1475 North Scottsdale Road, Suite 200
+ Scottsdale, Arizona 85257-3538
+ USA
+ View in Google Maps +
+
+
+
+
+ +
+
+
+
+ + +
+
- -
-
-
+ @@ -62,3 +67,12 @@ + diff --git a/assets/img/blog/2017-02-11ICEtotalgamingvideo.png b/assets/img/blog/2017-02-11ICEtotalgamingvideo.png new file mode 100644 index 0000000..f74736e Binary files /dev/null and b/assets/img/blog/2017-02-11ICEtotalgamingvideo.png differ diff --git a/blog/index.html b/blog/index.html index 7fd1dc8..69749e7 100644 --- a/blog/index.html +++ b/blog/index.html @@ -6,6 +6,19 @@ description: pages.blog.description {% include hero/blog.html %} + +
@@ -14,6 +27,7 @@ description: pages.blog.description {% for post in paginator.posts %}
+
{% if post.image %} @@ -25,6 +39,7 @@ description: pages.blog.description {{ post.date | date: "%b %d, %Y" }}

{{ post.excerpt | strip_html | truncatewords: 50 }}

+
{% endfor %} diff --git a/index.html b/index.html index e11291c..9096c55 100644 --- a/index.html +++ b/index.html @@ -292,7 +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/src/js/contact.js b/src/js/contact.js index 98f4d2f..ad2c846 100755 --- a/src/js/contact.js +++ b/src/js/contact.js @@ -10,14 +10,14 @@ console.log(name, email, category, message); $(this).closest('form').find('input[type=text], textarea').val(''); - $.post("http://localhost:8080/send-contact-email/",{ + $.post('http://localhost:8080/send-contact-email/',{ from: name, email: email, subject: category, message: message - }, function(response){ + }, function(response) { console.info('Message sent: ' , response); - }) + }); $('#msg_sent').css('display', 'inline-block'); diff --git a/src/scss/_interior.scss b/src/scss/_interior.scss index 802f964..598c02a 100644 --- a/src/scss/_interior.scss +++ b/src/scss/_interior.scss @@ -83,6 +83,11 @@ iframe { padding: 10px; margin-bottom: 20px; text-align: center; + &.compact { + padding: 6px; + margin-bottom: 10px; + line-height: 1.4; + } h2 { font-size: 64px; margin-bottom: 20px; diff --git a/src/scss/_junk-drawer.scss b/src/scss/_junk-drawer.scss index 4bcc93d..42ed636 100755 --- a/src/scss/_junk-drawer.scss +++ b/src/scss/_junk-drawer.scss @@ -71,7 +71,7 @@ $wallet-tile-hover-background-base-color: lighten($color-blue-light, 9); & .thumbnail { & .logo-container { margin: $wallet-tile-spacing auto; - padding: $wallet-tile-spacing*.3; + padding: 0; display: block; max-width: $wallet-tile-logo-container-width; max-height: $wallet-tile-logo-container-height; diff --git a/wallets/index.html b/wallets/index.html index 3867aad..e1f3942 100644 --- a/wallets/index.html +++ b/wallets/index.html @@ -19,7 +19,7 @@ description: pages.wallets.description {% include wallets_js_data.html %} {% for vendor-group in vendor-collection %} - {% include modals/vendor-group-download-collection.html %} +{% include modals/vendor-group-download-collection.html %} {% endfor %}
@@ -27,7 +27,8 @@ description: pages.wallets.description

{% t pages.wallets.wallets-security-header %}

-

{% t pages.wallets.wallets-security-subtitle %} keepass.info

+

{% t pages.wallets.wallets-security-subtitle %} keepass.info +

{% for wallet in security-wallets %} {% include wallet-tile.html %} @@ -36,94 +37,96 @@ description: pages.wallets.description
-
-
-

{% t pages.wallets.wallets-desktop-header %}

-

{% t pages.wallets.wallets-desktop-subtitle %}

- +
+ {% for os-sequence in desktop-os-order-list %} + {% for wallet-group in desktop-os-collection %} + {% if os-sequence == wallet-group.name %} + {% include wallet-tile-group-container.html %} + {% endif %} + {% endfor %} + {% endfor %} +
+
+
-
-
-

{% t pages.wallets.wallets-mobile-header %}

-

{% t pages.wallets.wallets-mobile-subtitle %}

- -
- {% for wallet-group in mobile-os-collection %} - {% include wallet-tile-group-container.html %} - {% endfor %} -
-
-
+
+
+

{% t pages.wallets.wallets-mobile-header %}

+

{% t pages.wallets.wallets-mobile-subtitle %}

+ +
+ {% for wallet-group in mobile-os-collection %} + {% include wallet-tile-group-container.html %} + {% endfor %} +
+
+
-
-
-

{% t pages.wallets.wallets-hardware-header %}

-

{% t pages.wallets.wallets-hardware-subtitle %}

-
- {% for wallet in hardware-wallets %} - {% include wallet-tile.html %} - {% endfor %} -
-
-
-
-
-

{% t pages.wallets.wallets-paper-header %}

-

{% t pages.wallets.wallets-paper-subtitle %}

+
+
+

{% t pages.wallets.wallets-hardware-header %}

+

{% t pages.wallets.wallets-hardware-subtitle %}

+
+ {% for wallet in hardware-wallets %} + {% include wallet-tile.html %} + {% endfor %} +
+
+
+
+
+

{% t pages.wallets.wallets-paper-header %}

+

{% t pages.wallets.wallets-paper-subtitle %}

-
- {% for wallet in paper-wallets %} - {% include wallet-tile.html %} - {% endfor %} -
-
-
+
+ {% for wallet in paper-wallets %} + {% include wallet-tile.html %} + {% endfor %} +
+
+