mirror of
https://github.com/seigler/dash-website
synced 2025-07-26 23:06:09 +00:00
Merge remote-tracking branch 'dashpay/master'
This commit is contained in:
tungfa
commit
2fbce34681
5 changed files with 192 additions and 185 deletions
|
|
@ -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: |
|
||||
|
|
|
|||
|
|
@ -19,7 +19,11 @@
|
|||
{% t pages.contact.form-pretext-2 %}
|
||||
<a style="display: inline-block;" href="mailto:contact@dash.org"> Contact us.</a> <!-- !!!remove after form is back up-->
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="col-sm-4 col-sm-offset-4 callout-blue">
|
||||
Dash <br />
|
||||
1475 North Scottsdale Road, Suite 200 <br />
|
||||
Scottsdale, Arizona 85257-3538 <br />
|
||||
USA
|
||||
<!-- <form onsubmit="return false;">-->
|
||||
<!-- <div class="row">-->
|
||||
<!-- <div class="col-xs-12">-->
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ description: pages.home.description
|
|||
<h2>{% t pages.home.evolution-heading %}</h2>
|
||||
|
||||
{% tmd pages.home.evolution-text %}
|
||||
<a href="{{{basenav}}/evolution/" target="_blank" class="btn-blue">{% t pages.home.evolution-btn %}</a>
|
||||
<a href="{{basenav}}/evolution/" target="_blank" class="btn-blue">{% t pages.home.evolution-btn %}</a>
|
||||
</div>
|
||||
<div class="col-sm-6 col-sm-pull-6 home-evolution-graphic">
|
||||
<img src="/assets/img/home/evo.png" alt="Dash Evolution">
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,8 @@ description: pages.wallets.description
|
|||
<section class="section clearfix">
|
||||
<div class="section__content">
|
||||
<h3>{% t pages.wallets.wallets-security-header %}</h3>
|
||||
<p>{% t pages.wallets.wallets-security-subtitle %} <a href="http://keepass.info/" target="_blank">keepass.info</a></p>
|
||||
<p>{% t pages.wallets.wallets-security-subtitle %} <a href="http://keepass.info/" target="_blank">keepass.info</a>
|
||||
</p>
|
||||
<div class="row">
|
||||
{% for wallet in security-wallets %}
|
||||
{% include wallet-tile.html %}
|
||||
|
|
@ -44,7 +45,8 @@ description: pages.wallets.description
|
|||
{% for os-sequence in desktop-os-order-list %}
|
||||
{% for wallet-group in desktop-os-collection %}
|
||||
{% if os-sequence == wallet-group.name %}
|
||||
<li role="tab" {%if forloop.first == true %}class="active"{% endif %}><a data-toggle="pill" href="#{{wallet-group.name}}">
|
||||
<li role="tab" {%if forloop.first== true %}class="active" {% endif %}><a data-toggle="pill"
|
||||
href="#{{wallet-group.name}}">
|
||||
{% case wallet-group.name %}
|
||||
{% when 'win64' %}
|
||||
Windows (64bit)
|
||||
|
|
@ -82,7 +84,8 @@ description: pages.wallets.description
|
|||
<p>{% t pages.wallets.wallets-mobile-subtitle %}</p>
|
||||
<ul id="wallet-mobile-os-tabs" class="nav2 nav-tabs " role="">
|
||||
{% for wallet-group in mobile-os-collection %}
|
||||
<li {%if forloop.first == true %}class="active"{% endif %} role="tab"><a data-toggle="pill" href="#{{wallet-group.name}}">
|
||||
<li {%if forloop.first== true %}class="active" {% endif %} role="tab"><a data-toggle="pill"
|
||||
href="#{{wallet-group.name}}">
|
||||
{% case wallet-group.name %}
|
||||
{% when 'android' %}
|
||||
Android
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue