From 0b956bbe43ab7f0414befd6259288e340457531d Mon Sep 17 00:00:00 2001 From: Chuck Williams Date: Fri, 10 Feb 2017 21:42:56 -0700 Subject: [PATCH 1/2] -- wallets/index.html: Pulls all electrum wallets -- fixes padding for EXODUS logo -- fixes extra curly brace on homepage --- _data/wallets-collection.yml | 196 +++++++++++++++++------------------ index.html | 2 +- src/scss/_junk-drawer.scss | 2 +- wallets/index.html | 171 +++++++++++++++--------------- 4 files changed, 187 insertions(+), 184 deletions(-) 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/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/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 %} +
+
+
From 073acc5a76f6796a8c69d352a73e65e36cb4bf00 Mon Sep 17 00:00:00 2001 From: Chuck Williams Date: Fri, 10 Feb 2017 21:52:19 -0700 Subject: [PATCH 2/2] Adds address to contact page. --- _includes/hero/contact.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/_includes/hero/contact.html b/_includes/hero/contact.html index dfe3703..4078676 100644 --- a/_includes/hero/contact.html +++ b/_includes/hero/contact.html @@ -19,7 +19,11 @@ {% t pages.contact.form-pretext-2 %} Contact us.
-
+
+ Dash
+ 1475 North Scottsdale Road, Suite 200
+ Scottsdale, Arizona 85257-3538
+ USA