From 02646d1ce8e23b75c29eb14a420bd9deef9033b0 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Sat, 15 Jul 2017 12:58:40 +0200 Subject: [PATCH 01/37] Prepare for refactor. Move wallets to a _wallets folder. --- _wallets/airbitzwallet.md | 64 ++++++++++++++++++++ _wallets/arcbit.md | 83 ++++++++++++++++++++++++++ _wallets/armory.md | 28 +++++++++ _wallets/bitcoincore.md | 28 +++++++++ _wallets/bitcoinknots.md | 28 +++++++++ _wallets/bitcoinwallet.md | 65 ++++++++++++++++++++ _wallets/bitgo.md | 44 ++++++++++++++ _wallets/bither.md | 82 +++++++++++++++++++++++++ _wallets/breadwallet.md | 63 ++++++++++++++++++++ _wallets/btc.md | 80 +++++++++++++++++++++++++ _wallets/coinapult.md | 23 +++++++ _wallets/coinbase.md | 23 +++++++ _wallets/coinspace.md | 99 +++++++++++++++++++++++++++++++ _wallets/copay.md | 48 +++++++++++++++ _wallets/digitalbitbox.md | 20 +++++++ _wallets/electrum.md | 46 ++++++++++++++ _wallets/greenaddress.md | 102 ++++++++++++++++++++++++++++++++ _wallets/greenbits.md | 26 ++++++++ _wallets/keepkey.md | 20 +++++++ _wallets/ledgernano.md | 20 +++++++ _wallets/ledgernanos.md | 20 +++++++ _wallets/msigna.md | 28 +++++++++ _wallets/mycelium.md | 26 ++++++++ _wallets/simplebitcoinwallet.md | 44 ++++++++++++++ _wallets/trezor.md | 20 +++++++ _wallets/xapo.md | 23 +++++++ 26 files changed, 1153 insertions(+) create mode 100644 _wallets/airbitzwallet.md create mode 100644 _wallets/arcbit.md create mode 100644 _wallets/armory.md create mode 100644 _wallets/bitcoincore.md create mode 100644 _wallets/bitcoinknots.md create mode 100644 _wallets/bitcoinwallet.md create mode 100644 _wallets/bitgo.md create mode 100644 _wallets/bither.md create mode 100644 _wallets/breadwallet.md create mode 100644 _wallets/btc.md create mode 100644 _wallets/coinapult.md create mode 100644 _wallets/coinbase.md create mode 100644 _wallets/coinspace.md create mode 100644 _wallets/copay.md create mode 100644 _wallets/digitalbitbox.md create mode 100644 _wallets/electrum.md create mode 100644 _wallets/greenaddress.md create mode 100644 _wallets/greenbits.md create mode 100644 _wallets/keepkey.md create mode 100644 _wallets/ledgernano.md create mode 100644 _wallets/ledgernanos.md create mode 100644 _wallets/msigna.md create mode 100644 _wallets/mycelium.md create mode 100644 _wallets/simplebitcoinwallet.md create mode 100644 _wallets/trezor.md create mode 100644 _wallets/xapo.md diff --git a/_wallets/airbitzwallet.md b/_wallets/airbitzwallet.md new file mode 100644 index 00000000..28f5904f --- /dev/null +++ b/_wallets/airbitzwallet.md @@ -0,0 +1,64 @@ +--- +id: airbitzwallet +title: "Airbitz Bitcoin Wallet" +titleshort: "Airbitz" +compat: "mobile android ios" +level: 3 + +platform: + mobile: + text: "walletairbitzwallet" + link: "https://airbitz.co/bitcoin-wallet/" + source: "https://github.com/Airbitz" + screenshot: "airbitzwalletios.png" + os: + - android + - ios + check: + control: "checkpasscontrolhybrid" + validation: "checkpassvalidationservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + android: + text: "walletairbitzwallet" + link: "https://play.google.com/store/apps/details?id=com.airbitz" + source: "https://github.com/Airbitz" + screenshot: "airbitzwalletandroid.png" + os: + - android + check: + control: "checkpasscontrolhybrid" + validation: "checkpassvalidationservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + ios: + text: "walletairbitzwallet" + link: "https://itunes.apple.com/us/app/bitcoin-wallet-map-directory/id843536046?mt=8" + source: "https://github.com/Airbitz" + screenshot: "airbitzwalletios.png" + os: + - ios + check: + control: "checkpasscontrolhybrid" + validation: "checkpassvalidationservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" +--- diff --git a/_wallets/arcbit.md b/_wallets/arcbit.md new file mode 100644 index 00000000..1959ab16 --- /dev/null +++ b/_wallets/arcbit.md @@ -0,0 +1,83 @@ +--- +id: arcbit +title: "ArcBit" +titleshort: "ArcBit" +compat: "mobile desktop android ios windows mac linux" +level: 3 +platform: + mobile: + text: "walletarcbit" + link: "https://itunes.apple.com/app/arcbit-bitcoin-wallet/id999487888" + source: "https://github.com/arcbit/arcbit-ios" + screenshot: "arcbitios.png" + os: + - ios + - android + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroloverride" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkfailprivacynetworknosupporttor" + desktop: + text: "walletarcbit" + link: "https://chrome.google.com/webstore/detail/arcbit-bitcoin-wallet/dkceiphcnbfahjbomhpdgjmphnpgogfk" + source: "https://github.com/arcbit/arcbit-web" + screenshot: "arcbitdesktop.png" + os: + - windows + - mac + - linux + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkfailenvironmentdesktop" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroloverride" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkpassprivacynetworksupporttorproxy" + ios: + text: "walletarcbit" + link: "https://itunes.apple.com/app/arcbit-bitcoin-wallet/id999487888" + source: "https://github.com/arcbit/arcbit-ios" + screenshot: "arcbitios.png" + os: + - ios + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroloverride" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkfailprivacynetworknosupporttor" + android: + text: "walletarcbit" + link: "https://play.google.com/store/apps/details?id=com.arcbit.arcbit" + source: "https://github.com/arcbit/arcbit-android" + screenshot: "arcbitios.png" + os: + - android + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroloverride" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkfailprivacynetworknosupporttor" +--- diff --git a/_wallets/armory.md b/_wallets/armory.md new file mode 100644 index 00000000..951f8f68 --- /dev/null +++ b/_wallets/armory.md @@ -0,0 +1,28 @@ +--- +id: armory +title: "Armory" +titleshort: "Armory" +compat: "desktop windows mac linux" +level: 2 +platform: + desktop: + text: "walletarmory" + link: "https://btcarmory.com/" + source: "https://github.com/goatpig/BitcoinArmory" + screenshot: "armory.png" + os: + - windows + - mac + - linux + check: + control: "checkgoodcontrolfull" + validation: "checkgoodvalidationfullnoderequired" + transparency: "checkpasstransparencyopensource" + environment: "checkfailenvironmentdesktop" + privacy: "checkgoodprivacyimproved" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkpassprivacydisclosurefullnode" + privacynetwork: "checkpassprivacynetworksupporttorproxy" +--- diff --git a/_wallets/bitcoincore.md b/_wallets/bitcoincore.md new file mode 100644 index 00000000..2d51e6bb --- /dev/null +++ b/_wallets/bitcoincore.md @@ -0,0 +1,28 @@ +--- +id: bitcoincore +title: "Bitcoin Core" +titleshort: "Bitcoin
Core" +compat: "desktop windows mac linux" +level: 1 +platform: + desktop: + text: "walletbitcoinqt" + link: "bitcoincore" + source: "https://github.com/bitcoin/bitcoin" + screenshot: "bitcoincore.png" + os: + - windows + - mac + - linux + check: + control: "checkgoodcontrolfull" + validation: "checkgoodvalidationfullnode" + transparency: "checkgoodtransparencydeterministic" + environment: "checkfailenvironmentdesktop" + privacy: "checkgoodprivacyimproved" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkpassprivacydisclosurefullnode" + privacynetwork: "checkpassprivacynetworksupporttorproxy" +--- diff --git a/_wallets/bitcoinknots.md b/_wallets/bitcoinknots.md new file mode 100644 index 00000000..11c982d1 --- /dev/null +++ b/_wallets/bitcoinknots.md @@ -0,0 +1,28 @@ +--- +id: bitcoinknots +title: "Bitcoin Knots" +titleshort: "Bitcoin
Knots" +compat: "desktop windows mac linux" +level: 1 +platform: + desktop: + text: "walletbitcoinknots" + link: "https://bitcoinknots.org/" + source: "https://github.com/bitcoinknots/bitcoin/" + screenshot: "bitcoinknots.png" + os: + - windows + - mac + - linux + check: + control: "checkgoodcontrolfull" + validation: "checkgoodvalidationfullnode" + transparency: "checkgoodtransparencydeterministic" + environment: "checkfailenvironmentdesktop" + privacy: "checkgoodprivacyimproved" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkpassprivacydisclosurefullnode" + privacynetwork: "checkpassprivacynetworksupporttorproxy" +--- diff --git a/_wallets/bitcoinwallet.md b/_wallets/bitcoinwallet.md new file mode 100644 index 00000000..3a7b2e74 --- /dev/null +++ b/_wallets/bitcoinwallet.md @@ -0,0 +1,65 @@ +--- +id: bitcoinwallet +title: "Bitcoin Wallet" +titleshort: "Bitcoin
Wallet" +compat: "mobile android blackberry" +level: 2 +platform: + mobile: + text: "walletbitcoinwallet" + link: "https://play.google.com/store/apps/details?id=de.schildbach.wallet" + source: "https://github.com/bitcoin-wallet/bitcoin-wallet" + screenshot: "bitcoinwalletandroid.png" + os: + - android + - blackberry + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" + android: + text: "walletbitcoinwallet" + link: "https://play.google.com/store/apps/details?id=de.schildbach.wallet" + source: "https://github.com/bitcoin-wallet/bitcoin-wallet" + screenshot: "bitcoinwalletandroid.png" + os: + - android + - blackberry + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" + blackberry: + text: "walletbitcoinwallet" + link: "https://appworld.blackberry.com/webstore/content/23952882/" + source: "https://github.com/bitcoin-wallet/bitcoin-wallet" + screenshot: "bitcoinwalletandroid.png" + os: + - android + - blackberry + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" +--- diff --git a/_wallets/bitgo.md b/_wallets/bitgo.md new file mode 100644 index 00000000..627fc04a --- /dev/null +++ b/_wallets/bitgo.md @@ -0,0 +1,44 @@ +--- +id: bitgo +title: "BitGo" +titleshort: "BitGo" +compat: "web desktop windows mac linux" +level: 3 +platform: + desktop: + text: "walletbitgo" + link: "https://chrome.google.com/webstore/detail/bitgo/jlgeogaipkoajobchncghcojanffjfhl" + source: "https://github.com/BitGo/bitgo-chrome" + screenshot: "bitgo.png" + os: + - windows + - mac + - linux + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" + web: + text: "walletbitgo" + link: "https://www.bitgo.com/" + screenshot: "bitgo.png" + os: + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" +--- diff --git a/_wallets/bither.md b/_wallets/bither.md new file mode 100644 index 00000000..9d6b22fa --- /dev/null +++ b/_wallets/bither.md @@ -0,0 +1,82 @@ +--- +id: bither +title: "Bither" +titleshort: "Bither" +compat: "mobile ios android desktop windows mac linux" +level: 2 +platform: + mobile: + text: "walletbither" + link: "https://itunes.apple.com/us/app/bither/id899478936" + source: "https://github.com/bither/bither-ios" + screenshot: "bithermobile.png" + os: + - ios + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkfailprivacyweak" + fees: "checkfailfeecontrolstatic" + privacycheck: + privacyaddressreuse: "checkfailprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" + ios: + text: "walletbither" + link: "https://itunes.apple.com/us/app/bither/id899478936" + source: "https://github.com/bither/bither-ios" + screenshot: "bithermobile.png" + os: + - ios + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkfailprivacyweak" + fees: "checkfailfeecontrolstatic" + privacycheck: + privacyaddressreuse: "checkfailprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" + android: + text: "walletbither" + link: "https://play.google.com/store/apps/details?id=net.bither" + source: "https://github.com/bither/bither-android" + screenshot: "bithermobile.png" + os: + - android + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkfailprivacyweak" + fees: "checkfailfeecontrolstatic" + privacycheck: + privacyaddressreuse: "checkfailprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" + desktop: + text: "walletbither" + link: "https://bither.net" + source: "https://github.com/bither/bither-desktop-java" + screenshot: "bitherdesktop.png" + os: + - windows + - mac + - linux + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkfailenvironmentdesktop" + privacy: "checkfailprivacyweak" + fees: "checkfailfeecontrolstatic" + privacycheck: + privacyaddressreuse: "checkfailprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" +--- diff --git a/_wallets/breadwallet.md b/_wallets/breadwallet.md new file mode 100644 index 00000000..5c49bf24 --- /dev/null +++ b/_wallets/breadwallet.md @@ -0,0 +1,63 @@ +--- +id: breadwallet +title: "breadwallet" +titleshort: "breadwallet" +compat: "mobile android ios" +level: 2 +platform: + mobile: + text: "walletbreadwallet" + link: "https://itunes.apple.com/app/breadwallet/id885251393" + source: "https://github.com/voisine/breadwallet" + screenshot: "breadwallet.png" + os: + - ios + - android + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" + ios: + text: "walletbreadwallet" + link: "https://itunes.apple.com/app/breadwallet/id885251393" + source: "https://github.com/voisine/breadwallet" + screenshot: "breadwallet.png" + os: + - ios + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" + android: + text: "walletbreadwallet" + link: "https://play.google.com/store/apps/details?id=com.breadwallet" + source: "https://github.com/breadwallet/breadwallet-android" + screenshot: "breadwallet.png" + os: + - android + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" +--- diff --git a/_wallets/btc.md b/_wallets/btc.md new file mode 100644 index 00000000..b4dc8dbf --- /dev/null +++ b/_wallets/btc.md @@ -0,0 +1,80 @@ +--- +id: btc +title: "BTC.com Bitcoin Wallet" +titleshort: "BTC.com" +compat: "mobile web android ios" +level: 3 +platform: + mobile: + text: "walletbtccom" + link: "https://play.google.com/store/apps/details?id=com.blocktrail.mywallet" + source: "https://github.com/blocktrail/blocktrail-wallet" + screenshot: "btccomwallet.png" + os: + - android + - ios + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + web: + text: "walletbtccom" + link: "https://wallet.btc.com" + source: "https://github.com/blocktrail/blocktrail-webwallet" + screenshot: "btccomwallet.png" + os: + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" + ios: + text: "walletbtccom" + link: "https://itunes.apple.com/us/app/blocktrail-bitcoin-wallet/id1019614423" + source: "https://github.com/blocktrail/blocktrail-wallet" + screenshot: "btccomwallet.png" + os: + - ios + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + android: + text: "walletbtccom" + link: "https://play.google.com/store/apps/details?id=com.blocktrail.mywallet" + source: "https://github.com/blocktrail/blocktrail-wallet" + screenshot: "btccomwallet.png" + os: + - android + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" +--- diff --git a/_wallets/coinapult.md b/_wallets/coinapult.md new file mode 100644 index 00000000..2e8bce64 --- /dev/null +++ b/_wallets/coinapult.md @@ -0,0 +1,23 @@ +--- +id: coinapult +title: "Coinapult" +titleshort: "Coinapult" +compat: "web" +level: 4 +platform: + web: + text: "walletcoinapult" + link: "https://coinapult.com/" + screenshot: "coinapult.png" + os: + check: + control: "checkfailcontrolthirdparty" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkfailenvironmentdesktop" + privacy: "checkpassprivacybasic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" +--- diff --git a/_wallets/coinbase.md b/_wallets/coinbase.md new file mode 100644 index 00000000..6d06ddd6 --- /dev/null +++ b/_wallets/coinbase.md @@ -0,0 +1,23 @@ +--- +id: coinbase +title: "Coinbase" +titleshort: "Coinbase" +compat: "web" +level: 4 +platform: + web: + text: "walletcoinbase" + link: "https://coinbase.com" + screenshot: "coinbase.png" + os: + check: + control: "checkfailcontrolthirdparty" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkfailenvironmentdesktop" + privacy: "checkpassprivacybasic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" +--- diff --git a/_wallets/coinspace.md b/_wallets/coinspace.md new file mode 100644 index 00000000..419eb723 --- /dev/null +++ b/_wallets/coinspace.md @@ -0,0 +1,99 @@ +--- +id: coinspace +title: "Coin.Space" +titleshort: "Coin.Space" +compat: "mobile web android windowsphone ios" +level: 3 +platform: + mobile: + text: "walletcoinspace" + link: "https://play.google.com/store/apps/details?id=com.coinspace.app" + source: "https://github.com/CoinSpace/CoinSpace" + screenshot: "coinspacemobile.png" + os: + - android + - ios + - windowsphone + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencynew" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + android: + text: "walletcoinspace" + link: "https://play.google.com/store/apps/details?id=com.coinspace.app" + source: "https://github.com/CoinSpace/CoinSpace" + screenshot: "coinspacemobile.png" + os: + - android + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencynew" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + ios: + text: "walletcoinspace" + link: "https://itunes.apple.com/us/app/coinspace-bitcoin-wallet/id980719434?mt=8" + source: "https://github.com/CoinSpace/CoinSpace" + screenshot: "coinspacemobile.png" + os: + - ios + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencynew" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + windowsphone: + text: "walletcoinspace" + link: "https://www.microsoft.com/en-us/store/apps/coin-space-digital-currency-wallet/9nblgggz58z9" + source: "https://github.com/CoinSpace/CoinSpace" + screenshot: "coinspacemobile.png" + os: + - windowsphone + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencynew" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + web: + text: "walletcoinspace" + link: "https://coin.space" + source: "https://github.com/CoinSpace/CoinSpace" + screenshot: "coinspaceweb.png" + os: + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkfailenvironmentdesktop" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" +--- diff --git a/_wallets/copay.md b/_wallets/copay.md new file mode 100644 index 00000000..9c2cdc69 --- /dev/null +++ b/_wallets/copay.md @@ -0,0 +1,48 @@ +--- +id: copay +title: "Copay" +titleshort: "Copay" +compat: "mobile desktop web android ios windowsphone windows mac linux" +level: 3 +platform: + mobile: + text: "walletcopay" + link: "https://copay.io" + source: "https://github.com/bitpay/copay" + screenshot: "copay.png" + os: + - android + - ios + - windowsphone + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkfailprivacynetworknosupporttor" + desktop: + text: "walletcopay" + link: "https://copay.io/" + source: "https://github.com/bitpay/copay" + screenshot: "copay.png" + os: + - windows + - mac + - linux + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkfailenvironmentdesktop" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkfailprivacynetworknosupporttor" +--- diff --git a/_wallets/digitalbitbox.md b/_wallets/digitalbitbox.md new file mode 100644 index 00000000..64ca0f79 --- /dev/null +++ b/_wallets/digitalbitbox.md @@ -0,0 +1,20 @@ +--- +id: digitalbitbox +title: "DigitalBitbox" +titleshort: "Digital
Bitbox" +compat: "hardware" +level: 2 +platform: + hardware: + text: "walletdbb" + link: "https://digitalbitbox.com/" + source: "https://github.com/digitalbitbox/" + screenshot: "digitalbitbox.png" + check: + control: "checkgoodcontrolfull" + validation: "checkneutralvalidationvariable" + transparency: "checkfailtransparencynew" + environment: "checkgoodenvironmenthardware" + privacy: "checkneutralprivacyvariable" + fees: "checkneutralfeecontrolvariable" +--- diff --git a/_wallets/electrum.md b/_wallets/electrum.md new file mode 100644 index 00000000..08dbc94a --- /dev/null +++ b/_wallets/electrum.md @@ -0,0 +1,46 @@ +--- +id: electrum +title: "Electrum" +titleshort: "Electrum" +compat: "desktop windows mac linux mobile android" +level: 2 +platform: + desktop: + text: "walletelectrum" + link: "https://electrum.org" + source: "https://github.com/spesmilo/electrum" + screenshot: "electrum.png" + os: + - windows + - mac + - linux + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkpassprivacynetworksupporttorproxy" + mobile: + text: "walletelectrum" + link: "https://play.google.com/store/apps/details?id=org.electrum.electrum" + source: "https://github.com/spesmilo/electrum" + screenshot: "electrumandroid.png" + os: + - android + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" +--- diff --git a/_wallets/greenaddress.md b/_wallets/greenaddress.md new file mode 100644 index 00000000..867db7a4 --- /dev/null +++ b/_wallets/greenaddress.md @@ -0,0 +1,102 @@ +--- +id: greenaddress +title: "GreenAddress" +titleshort: "Green
Address" +compat: "mobile desktop web android ios windows mac linux" +level: 3 +platform: + mobile: + text: "walletgreenaddress" + link: "https://play.google.com/store/apps/details?id=it.greenaddress.cordova" + source: "https://github.com/greenaddress/WalletCordova" + screenshot: "greenaddressandroid.png" + os: + - android + - ios + check: + control: "checkpasscontrolmulti" + validation: "checkpassvalidationservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + desktop: + text: "walletgreenaddress" + link: "https://chrome.google.com/webstore/detail/greenaddressit/dgbimgjoijjemhdamicmljbncacfndmp" + source: "https://github.com/greenaddress/WalletCrx" + screenshot: "greenaddressdesktop.png" + os: + - windows + - mac + - linux + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" + web: + text: "walletgreenaddress" + link: "https://chrome.google.com/webstore/detail/greenaddressit/dgbimgjoijjemhdamicmljbncacfndmp" + source: "https://github.com/greenaddress/WalletCrx" + screenshot: "greenaddressdesktop.png" + os: + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" + ios: + text: "walletgreenaddress" + link: "https://itunes.apple.com/app/id1206035886" + source: "https://github.com/greenaddress/WalletCordova" + screenshot: "greenaddressandroid.png" + os: + - android + - ios + check: + control: "checkpasscontrolmulti" + validation: "checkpassvalidationservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + android: + text: "walletgreenaddress" + link: "https://play.google.com/store/apps/details?id=it.greenaddress.cordova" + source: "https://github.com/greenaddress/WalletCordova" + screenshot: "greenaddressandroid.png" + os: + - android + - ios + check: + control: "checkpasscontrolmulti" + validation: "checkpassvalidationservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" +--- diff --git a/_wallets/greenbits.md b/_wallets/greenbits.md new file mode 100644 index 00000000..5ed7c991 --- /dev/null +++ b/_wallets/greenbits.md @@ -0,0 +1,26 @@ +--- +id: greenbits +title: "GreenBits" +titleshort: "GreenBits" +compat: "mobile android" +level: 2 +platform: + mobile: + text: "walletgreenbits" + link: "https://play.google.com/store/apps/details?id=com.greenaddress.greenbits_android_wallet" + source: "https://github.com/greenaddress/GreenBits" + screenshot: "greenbits.png" + os: + - android + check: + control: "checkpasscontrolmulti" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" +--- diff --git a/_wallets/keepkey.md b/_wallets/keepkey.md new file mode 100644 index 00000000..8545fab0 --- /dev/null +++ b/_wallets/keepkey.md @@ -0,0 +1,20 @@ +--- +id: keepkey +title: "KeepKey" +titleshort: "KeepKey" +compat: "hardware" +level: 2 +platform: + hardware: + text: "walletkeepkey" + link: "https://www.keepkey.com/" + source: "https://github.com/keepkey/" + screenshot: "keepkey.png" + check: + control: "checkgoodcontrolfull" + validation: "checkneutralvalidationvariable" + transparency: "checkfailtransparencynew" + environment: "checkgoodenvironmenthardware" + privacy: "checkneutralprivacyvariable" + fees: "checkneutralfeecontrolvariable" +--- diff --git a/_wallets/ledgernano.md b/_wallets/ledgernano.md new file mode 100644 index 00000000..df96f0e8 --- /dev/null +++ b/_wallets/ledgernano.md @@ -0,0 +1,20 @@ +--- +id: ledgernano +title: "Ledger Nano" +titleshort: "Ledger
Nano" +compat: "hardware" +level: 2 +platform: + hardware: + text: "walletnano" + link: "https://www.ledgerwallet.com/" + source: "https://github.com/LedgerHQ/" + screenshot: "ledger.png" + check: + control: "checkgoodcontrolfull" + validation: "checkneutralvalidationvariable" + transparency: "checkfailtransparencynew" + environment: "checkgoodenvironmenthardware" + privacy: "checkneutralprivacyvariable" + fees: "checkneutralfeecontrolvariable" +--- diff --git a/_wallets/ledgernanos.md b/_wallets/ledgernanos.md new file mode 100644 index 00000000..59bccbb4 --- /dev/null +++ b/_wallets/ledgernanos.md @@ -0,0 +1,20 @@ +--- +id: ledgernanos +title: "Ledger Nano S" +titleshort: "Ledger
Nano S" +compat: "hardware" +level: 2 +platform: + hardware: + text: "walletnanos" + link: "https://www.ledgerwallet.com/" + source: "https://github.com/LedgerHQ/" + screenshot: "ledgernanos.png" + check: + control: "checkgoodcontrolfull" + validation: "checkneutralvalidationvariable" + transparency: "checkfailtransparencynew" + environment: "checkgoodenvironmenthardware" + privacy: "checkneutralprivacyvariable" + fees: "checkneutralfeecontrolvariable" +--- diff --git a/_wallets/msigna.md b/_wallets/msigna.md new file mode 100644 index 00000000..aeca2f82 --- /dev/null +++ b/_wallets/msigna.md @@ -0,0 +1,28 @@ +--- +id: msigna +title: "mSIGNA" +titleshort: "mSIGNA" +compat: "desktop windows mac linux" +level: 2 +platform: + desktop: + text: "walletmsigna" + link: "https://ciphrex.com/redirect/?referer=bitcoin.org" + source: "https://ciphrex.com/redirect/?url=https://github.com/ciphrex/CoinVault?referer=bitcoin.org" + screenshot: "msigna.png" + os: + - windows + - mac + - linux + check: + control: "checkgoodcontrolfull" + validation: "checkgoodvalidationfullnoderequired" + transparency: "checkpasstransparencyopensource" + environment: "checkfailenvironmentdesktop" + privacy: "checkgoodprivacyimproved" + fees: "checkfailfeecontrolstatic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkpassprivacydisclosurefullnode" + privacynetwork: "checkpassprivacynetworksupporttorproxy" +--- diff --git a/_wallets/mycelium.md b/_wallets/mycelium.md new file mode 100644 index 00000000..460c8bc5 --- /dev/null +++ b/_wallets/mycelium.md @@ -0,0 +1,26 @@ +--- +id: mycelium +title: "Mycelium" +titleshort: "Mycelium" +compat: "mobile android" +level: 3 +platform: + mobile: + text: "walletmyceliumwallet" + link: "https://play.google.com/store/apps/details?id=com.mycelium.wallet" + source: "https://github.com/mycelium-com/wallet" + screenshot: "mycelium.png" + os: + - android + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkpassprivacynetworksupporttorproxy" +--- diff --git a/_wallets/simplebitcoinwallet.md b/_wallets/simplebitcoinwallet.md new file mode 100644 index 00000000..459255a3 --- /dev/null +++ b/_wallets/simplebitcoinwallet.md @@ -0,0 +1,44 @@ +--- +id: simplebitcoinwallet +title: "Simple Bitcoin Wallet" +titleshort: "Simple
Bitcoin" +compat: "mobile android" +level: 2 +platform: + mobile: + text: "walletsimplebitcoinwallet" + link: "https://play.google.com/store/apps/details?id=com.btcontract.wallet" + source: "https://github.com/btcontract/wallet" + screenshot: "simplebitcoinwalletandroid.png" + os: + - android + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" + android: + text: "walletsimplebitcoinwallet" + link: "https://play.google.com/store/apps/details?id=com.btcontract.wallet" + source: "https://github.com/btcontract/wallet" + screenshot: "simplebitcoinwalletandroid.png" + os: + - android + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" +--- diff --git a/_wallets/trezor.md b/_wallets/trezor.md new file mode 100644 index 00000000..33405280 --- /dev/null +++ b/_wallets/trezor.md @@ -0,0 +1,20 @@ +--- +id: trezor +title: "Trezor" +titleshort: "Trezor" +compat: "hardware" +level: 2 +platform: + hardware: + text: "wallettrezor" + link: "https://trezor.io/" + source: "https://github.com/trezor/" + screenshot: "trezor.png" + check: + control: "checkgoodcontrolfull" + validation: "checkneutralvalidationvariable" + transparency: "checkgoodtransparencydeterministic" + environment: "checkgoodenvironmenthardware" + privacy: "checkneutralprivacyvariable" + fees: "checkneutralfeecontrolvariable" +--- diff --git a/_wallets/xapo.md b/_wallets/xapo.md new file mode 100644 index 00000000..8af22a3b --- /dev/null +++ b/_wallets/xapo.md @@ -0,0 +1,23 @@ +--- +id: xapo +title: "Xapo" +titleshort: "Xapo" +compat: "web" +level: 4 +platform: + web: + text: "walletxapo" + link: "https://xapo.com/" + screenshot: "xapo.png" + os: + check: + control: "checkfailcontrolthirdpartyinsured" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkfailenvironmentdesktop" + privacy: "checkpassprivacybasic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" +--- From 771951cb776cefbc902fbe19d0112a1982b5e1c3 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Sat, 15 Jul 2017 12:59:33 +0200 Subject: [PATCH 02/37] Recreate platforms structure with Jekyll folders --- _platforms/desktop/linux.html | 0 _platforms/desktop/mac.html | 0 _platforms/desktop/windows.html | 0 _platforms/hardware.html | 0 _platforms/mobile/android.html | 0 _platforms/mobile/blackberry.html | 0 _platforms/mobile/ios.html | 0 _platforms/mobile/windows-phone.html | 0 _platforms/web.html | 0 9 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 _platforms/desktop/linux.html create mode 100644 _platforms/desktop/mac.html create mode 100644 _platforms/desktop/windows.html create mode 100644 _platforms/hardware.html create mode 100644 _platforms/mobile/android.html create mode 100644 _platforms/mobile/blackberry.html create mode 100644 _platforms/mobile/ios.html create mode 100644 _platforms/mobile/windows-phone.html create mode 100644 _platforms/web.html diff --git a/_platforms/desktop/linux.html b/_platforms/desktop/linux.html new file mode 100644 index 00000000..e69de29b diff --git a/_platforms/desktop/mac.html b/_platforms/desktop/mac.html new file mode 100644 index 00000000..e69de29b diff --git a/_platforms/desktop/windows.html b/_platforms/desktop/windows.html new file mode 100644 index 00000000..e69de29b diff --git a/_platforms/hardware.html b/_platforms/hardware.html new file mode 100644 index 00000000..e69de29b diff --git a/_platforms/mobile/android.html b/_platforms/mobile/android.html new file mode 100644 index 00000000..e69de29b diff --git a/_platforms/mobile/blackberry.html b/_platforms/mobile/blackberry.html new file mode 100644 index 00000000..e69de29b diff --git a/_platforms/mobile/ios.html b/_platforms/mobile/ios.html new file mode 100644 index 00000000..e69de29b diff --git a/_platforms/mobile/windows-phone.html b/_platforms/mobile/windows-phone.html new file mode 100644 index 00000000..e69de29b diff --git a/_platforms/web.html b/_platforms/web.html new file mode 100644 index 00000000..e69de29b From 3e422f1e4d33f5a74949b4c77c079854150936d3 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Sat, 15 Jul 2017 16:24:21 +0200 Subject: [PATCH 03/37] Add mobile platform pages. --- _config.yml | 6 ++++ _includes/templates/wallet-platform.html | 44 ++++++++++++++++++++++++ _platforms/mobile/android.html | 11 ++++++ _platforms/mobile/blackberry.html | 11 ++++++ _platforms/mobile/ios.html | 11 ++++++ _platforms/mobile/windows-phone.html | 11 ++++++ 6 files changed, 94 insertions(+) create mode 100644 _includes/templates/wallet-platform.html diff --git a/_config.yml b/_config.yml index 2fe7b627..877c8d6e 100644 --- a/_config.yml +++ b/_config.yml @@ -575,6 +575,12 @@ collections: releases: output: true permalink: /en/release/:path + ## _wallets + wallets: + output: false + platforms: + output: true + permalink: /en/wallets/:path/ defaults: - scope: diff --git a/_includes/templates/wallet-platform.html b/_includes/templates/wallet-platform.html new file mode 100644 index 00000000..1af5a150 --- /dev/null +++ b/_includes/templates/wallet-platform.html @@ -0,0 +1,44 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +

{% translate pagetitle %}

+

{% translate pagedesc %}

+ + + +
+{% for wallet in site.wallets %} + {% if wallet.compat contains page.platform and wallet.compat contains page.os %} +
+ + {{ wallet.title }} + {{ wallet.titleshort }} + +
+ {% endif %} +{% endfor %} +
diff --git a/_platforms/mobile/android.html b/_platforms/mobile/android.html index e69de29b..f036207c 100644 --- a/_platforms/mobile/android.html +++ b/_platforms/mobile/android.html @@ -0,0 +1,11 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base +id: wallets-mobile-android +platform: mobile +os: android +--- + +{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/mobile/blackberry.html b/_platforms/mobile/blackberry.html index e69de29b..e7dd8daf 100644 --- a/_platforms/mobile/blackberry.html +++ b/_platforms/mobile/blackberry.html @@ -0,0 +1,11 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base +id: wallets-mobile-blackberry +platform: mobile +os: blackberry +--- + +{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/mobile/ios.html b/_platforms/mobile/ios.html index e69de29b..8cfb658e 100644 --- a/_platforms/mobile/ios.html +++ b/_platforms/mobile/ios.html @@ -0,0 +1,11 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base +id: wallets-mobile-ios +platform: mobile +os: ios +--- + +{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/mobile/windows-phone.html b/_platforms/mobile/windows-phone.html index e69de29b..1944fa2a 100644 --- a/_platforms/mobile/windows-phone.html +++ b/_platforms/mobile/windows-phone.html @@ -0,0 +1,11 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base +id: wallets-mobile-windowsphone +platform: mobile +os: windowsphone +--- + +{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} From 0a086f5792956f542ad8e7ac280324eecaec4c6f Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Sat, 15 Jul 2017 16:24:39 +0200 Subject: [PATCH 04/37] Fixing issue with btc.com wallet file --- _wallets/{btc.md => btc.com.md} | 2 +- _wallets/electrum.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename _wallets/{btc.md => btc.com.md} (99%) diff --git a/_wallets/btc.md b/_wallets/btc.com.md similarity index 99% rename from _wallets/btc.md rename to _wallets/btc.com.md index b4dc8dbf..aa20a74f 100644 --- a/_wallets/btc.md +++ b/_wallets/btc.com.md @@ -1,5 +1,5 @@ --- -id: btc +id: btc.com title: "BTC.com Bitcoin Wallet" titleshort: "BTC.com" compat: "mobile web android ios" diff --git a/_wallets/electrum.md b/_wallets/electrum.md index 08dbc94a..8c48ad22 100644 --- a/_wallets/electrum.md +++ b/_wallets/electrum.md @@ -25,7 +25,7 @@ platform: privacyaddressreuse: "checkpassprivacyaddressrotation" privacydisclosure: "checkfailprivacydisclosurecentralized" privacynetwork: "checkpassprivacynetworksupporttorproxy" - mobile: + android: text: "walletelectrum" link: "https://play.google.com/store/apps/details?id=org.electrum.electrum" source: "https://github.com/spesmilo/electrum" From f6c0429ddb087d4b4be75702c43214f16dfa3de5 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Sat, 15 Jul 2017 16:24:56 +0200 Subject: [PATCH 05/37] Removed trailing space --- _plugins/templates.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_plugins/templates.rb b/_plugins/templates.rb index c9acb834..59dc9301 100644 --- a/_plugins/templates.rb +++ b/_plugins/templates.rb @@ -2,7 +2,7 @@ # http://opensource.org/licenses/MIT. #templates.rb generates all translated pages using templates in -#_templates. The final file name of each page is defined in +#_templates. The final file name of each page is defined in #the url section of each translations in _translations. require 'yaml' From c07521d03217a6bcda5f9f7f30800a1fbddf21ae Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Sat, 15 Jul 2017 16:26:07 +0200 Subject: [PATCH 06/37] Replace page.wallets with site.wallets in _templates/choose-your-wallet.html --- _templates/choose-your-wallet.html | 1105 +--------------------------- 1 file changed, 1 insertion(+), 1104 deletions(-) diff --git a/_templates/choose-your-wallet.html b/_templates/choose-your-wallet.html index dc942596..076663e2 100755 --- a/_templates/choose-your-wallet.html +++ b/_templates/choose-your-wallet.html @@ -8,1109 +8,6 @@ layout: base id: choose-your-wallet max_wallet_text_length: 418 ## Unicode characters - -wallets: -- bitcoincore: - title: "Bitcoin Core" - titleshort: "Bitcoin
Core" - compat: "desktop windows mac linux" - level: 1 - platform: - desktop: - text: "walletbitcoinqt" - link: "bitcoincore" - source: "https://github.com/bitcoin/bitcoin" - screenshot: "bitcoincore.png" - os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkgoodvalidationfullnode" - transparency: "checkgoodtransparencydeterministic" - environment: "checkfailenvironmentdesktop" - privacy: "checkgoodprivacyimproved" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkpassprivacydisclosurefullnode" - privacynetwork: "checkpassprivacynetworksupporttorproxy" -- bitcoinknots: - title: "Bitcoin Knots" - titleshort: "Bitcoin
Knots" - compat: "desktop windows mac linux" - level: 1 - platform: - desktop: - text: "walletbitcoinknots" - link: "https://bitcoinknots.org/" - source: "https://github.com/bitcoinknots/bitcoin/" - screenshot: "bitcoinknots.png" - os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkgoodvalidationfullnode" - transparency: "checkgoodtransparencydeterministic" - environment: "checkfailenvironmentdesktop" - privacy: "checkgoodprivacyimproved" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkpassprivacydisclosurefullnode" - privacynetwork: "checkpassprivacynetworksupporttorproxy" -- armory: - title: "Armory" - titleshort: "Armory" - compat: "desktop windows mac linux" - level: 2 - platform: - desktop: - text: "walletarmory" - link: "https://btcarmory.com/" - source: "https://github.com/goatpig/BitcoinArmory" - screenshot: "armory.png" - os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkgoodvalidationfullnoderequired" - transparency: "checkpasstransparencyopensource" - environment: "checkfailenvironmentdesktop" - privacy: "checkgoodprivacyimproved" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkpassprivacydisclosurefullnode" - privacynetwork: "checkpassprivacynetworksupporttorproxy" -- electrum: - title: "Electrum" - titleshort: "Electrum" - compat: "desktop windows mac linux mobile android" - level: 2 - platform: - desktop: - text: "walletelectrum" - link: "https://electrum.org" - source: "https://github.com/spesmilo/electrum" - screenshot: "electrum.png" - os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkpassprivacynetworksupporttorproxy" - mobile: - text: "walletelectrum" - link: "https://play.google.com/store/apps/details?id=org.electrum.electrum" - source: "https://github.com/spesmilo/electrum" - screenshot: "electrumandroid.png" - os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" -- msigna: - title: "mSIGNA" - titleshort: "mSIGNA" - compat: "desktop windows mac linux" - level: 2 - platform: - desktop: - text: "walletmsigna" - link: "https://ciphrex.com/redirect/?referer=bitcoin.org" - source: "https://ciphrex.com/redirect/?url=https://github.com/ciphrex/CoinVault?referer=bitcoin.org" - screenshot: "msigna.png" - os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkgoodvalidationfullnoderequired" - transparency: "checkpasstransparencyopensource" - environment: "checkfailenvironmentdesktop" - privacy: "checkgoodprivacyimproved" - fees: "checkfailfeecontrolstatic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkpassprivacydisclosurefullnode" - privacynetwork: "checkpassprivacynetworksupporttorproxy" -- bitcoinwallet: - title: "Bitcoin Wallet" - titleshort: "Bitcoin
Wallet" - compat: "mobile android blackberry" - level: 2 - platform: - mobile: - text: "walletbitcoinwallet" - link: "https://play.google.com/store/apps/details?id=de.schildbach.wallet" - source: "https://github.com/bitcoin-wallet/bitcoin-wallet" - screenshot: "bitcoinwalletandroid.png" - os: - - android - - blackberry - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletbitcoinwallet" - link: "https://play.google.com/store/apps/details?id=de.schildbach.wallet" - source: "https://github.com/bitcoin-wallet/bitcoin-wallet" - screenshot: "bitcoinwalletandroid.png" - os: - - android - - blackberry - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - blackberry: - text: "walletbitcoinwallet" - link: "https://appworld.blackberry.com/webstore/content/23952882/" - source: "https://github.com/bitcoin-wallet/bitcoin-wallet" - screenshot: "bitcoinwalletandroid.png" - os: - - android - - blackberry - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" -- copay: - title: "Copay" - titleshort: "Copay" - compat: "mobile desktop web android ios windowsphone windows mac linux" - level: 3 - platform: - mobile: - text: "walletcopay" - link: "https://copay.io" - source: "https://github.com/bitpay/copay" - screenshot: "copay.png" - os: - - android - - ios - - windowsphone - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkfailprivacynetworknosupporttor" - desktop: - text: "walletcopay" - link: "https://copay.io/" - source: "https://github.com/bitpay/copay" - screenshot: "copay.png" - os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkfailenvironmentdesktop" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkfailprivacynetworknosupporttor" -- airbitzwallet: - title: "Airbitz Bitcoin Wallet" - titleshort: "Airbitz" - compat: "mobile android ios" - level: 3 - - platform: - mobile: - text: "walletairbitzwallet" - link: "https://airbitz.co/bitcoin-wallet/" - source: "https://github.com/Airbitz" - screenshot: "airbitzwalletios.png" - os: - - android - - ios - check: - control: "checkpasscontrolhybrid" - validation: "checkpassvalidationservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletairbitzwallet" - link: "https://play.google.com/store/apps/details?id=com.airbitz" - source: "https://github.com/Airbitz" - screenshot: "airbitzwalletandroid.png" - os: - - android - check: - control: "checkpasscontrolhybrid" - validation: "checkpassvalidationservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - ios: - text: "walletairbitzwallet" - link: "https://itunes.apple.com/us/app/bitcoin-wallet-map-directory/id843536046?mt=8" - source: "https://github.com/Airbitz" - screenshot: "airbitzwalletios.png" - os: - - ios - check: - control: "checkpasscontrolhybrid" - validation: "checkpassvalidationservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" -- breadwallet: - title: "breadwallet" - titleshort: "breadwallet" - compat: "mobile android ios" - level: 2 - platform: - mobile: - text: "walletbreadwallet" - link: "https://itunes.apple.com/app/breadwallet/id885251393" - source: "https://github.com/voisine/breadwallet" - screenshot: "breadwallet.png" - os: - - ios - - android - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - ios: - text: "walletbreadwallet" - link: "https://itunes.apple.com/app/breadwallet/id885251393" - source: "https://github.com/voisine/breadwallet" - screenshot: "breadwallet.png" - os: - - ios - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletbreadwallet" - link: "https://play.google.com/store/apps/details?id=com.breadwallet" - source: "https://github.com/breadwallet/breadwallet-android" - screenshot: "breadwallet.png" - os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" -- trezor: - title: "Trezor" - titleshort: "Trezor" - compat: "hardware" - level: 2 - platform: - hardware: - text: "wallettrezor" - link: "https://trezor.io/" - source: "https://github.com/trezor/" - screenshot: "trezor.png" - check: - control: "checkgoodcontrolfull" - validation: "checkneutralvalidationvariable" - transparency: "checkgoodtransparencydeterministic" - environment: "checkgoodenvironmenthardware" - privacy: "checkneutralprivacyvariable" - fees: "checkneutralfeecontrolvariable" -- ledgernano: - title: "Ledger Nano" - titleshort: "Ledger
Nano" - compat: "hardware" - level: 2 - platform: - hardware: - text: "walletnano" - link: "https://www.ledgerwallet.com/" - source: "https://github.com/LedgerHQ/" - screenshot: "ledger.png" - check: - control: "checkgoodcontrolfull" - validation: "checkneutralvalidationvariable" - transparency: "checkfailtransparencynew" - environment: "checkgoodenvironmenthardware" - privacy: "checkneutralprivacyvariable" - fees: "checkneutralfeecontrolvariable" -- ledgernanos: - title: "Ledger Nano S" - titleshort: "Ledger
Nano S" - compat: "hardware" - level: 2 - platform: - hardware: - text: "walletnanos" - link: "https://www.ledgerwallet.com/" - source: "https://github.com/LedgerHQ/" - screenshot: "ledgernanos.png" - check: - control: "checkgoodcontrolfull" - validation: "checkneutralvalidationvariable" - transparency: "checkfailtransparencynew" - environment: "checkgoodenvironmenthardware" - privacy: "checkneutralprivacyvariable" - fees: "checkneutralfeecontrolvariable" -- digitalbitbox: - title: "DigitalBitbox" - titleshort: "Digital
Bitbox" - compat: "hardware" - level: 2 - platform: - hardware: - text: "walletdbb" - link: "https://digitalbitbox.com/" - source: "https://github.com/digitalbitbox/" - screenshot: "digitalbitbox.png" - check: - control: "checkgoodcontrolfull" - validation: "checkneutralvalidationvariable" - transparency: "checkfailtransparencynew" - environment: "checkgoodenvironmenthardware" - privacy: "checkneutralprivacyvariable" - fees: "checkneutralfeecontrolvariable" -- bither: - title: "Bither" - titleshort: "Bither" - compat: "mobile ios android desktop windows mac linux" - level: 2 - platform: - mobile: - text: "walletbither" - link: "https://itunes.apple.com/us/app/bither/id899478936" - source: "https://github.com/bither/bither-ios" - screenshot: "bithermobile.png" - os: - - ios - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkfailprivacyweak" - fees: "checkfailfeecontrolstatic" - privacycheck: - privacyaddressreuse: "checkfailprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - ios: - text: "walletbither" - link: "https://itunes.apple.com/us/app/bither/id899478936" - source: "https://github.com/bither/bither-ios" - screenshot: "bithermobile.png" - os: - - ios - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkfailprivacyweak" - fees: "checkfailfeecontrolstatic" - privacycheck: - privacyaddressreuse: "checkfailprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletbither" - link: "https://play.google.com/store/apps/details?id=net.bither" - source: "https://github.com/bither/bither-android" - screenshot: "bithermobile.png" - os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkfailprivacyweak" - fees: "checkfailfeecontrolstatic" - privacycheck: - privacyaddressreuse: "checkfailprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - desktop: - text: "walletbither" - link: "https://bither.net" - source: "https://github.com/bither/bither-desktop-java" - screenshot: "bitherdesktop.png" - os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkfailenvironmentdesktop" - privacy: "checkfailprivacyweak" - fees: "checkfailfeecontrolstatic" - privacycheck: - privacyaddressreuse: "checkfailprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" -- greenbits: - title: "GreenBits" - titleshort: "GreenBits" - compat: "mobile android" - level: 2 - platform: - mobile: - text: "walletgreenbits" - link: "https://play.google.com/store/apps/details?id=com.greenaddress.greenbits_android_wallet" - source: "https://github.com/greenaddress/GreenBits" - screenshot: "greenbits.png" - os: - - android - check: - control: "checkpasscontrolmulti" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" -- mycelium: - title: "Mycelium" - titleshort: "Mycelium" - compat: "mobile android" - level: 3 - platform: - mobile: - text: "walletmyceliumwallet" - link: "https://play.google.com/store/apps/details?id=com.mycelium.wallet" - source: "https://github.com/mycelium-com/wallet" - screenshot: "mycelium.png" - os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkpassprivacynetworksupporttorproxy" -- bitgo: - title: "BitGo" - titleshort: "BitGo" - compat: "web desktop windows mac linux" - level: 3 - platform: - desktop: - text: "walletbitgo" - link: "https://chrome.google.com/webstore/detail/bitgo/jlgeogaipkoajobchncghcojanffjfhl" - source: "https://github.com/BitGo/bitgo-chrome" - screenshot: "bitgo.png" - os: - - windows - - mac - - linux - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" - web: - text: "walletbitgo" - link: "https://www.bitgo.com/" - screenshot: "bitgo.png" - os: - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" -- greenaddress: - title: "GreenAddress" - titleshort: "Green
Address" - compat: "mobile desktop web android ios windows mac linux" - level: 3 - platform: - mobile: - text: "walletgreenaddress" - link: "https://play.google.com/store/apps/details?id=it.greenaddress.cordova" - source: "https://github.com/greenaddress/WalletCordova" - screenshot: "greenaddressandroid.png" - os: - - android - - ios - check: - control: "checkpasscontrolmulti" - validation: "checkpassvalidationservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - desktop: - text: "walletgreenaddress" - link: "https://chrome.google.com/webstore/detail/greenaddressit/dgbimgjoijjemhdamicmljbncacfndmp" - source: "https://github.com/greenaddress/WalletCrx" - screenshot: "greenaddressdesktop.png" - os: - - windows - - mac - - linux - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" - web: - text: "walletgreenaddress" - link: "https://chrome.google.com/webstore/detail/greenaddressit/dgbimgjoijjemhdamicmljbncacfndmp" - source: "https://github.com/greenaddress/WalletCrx" - screenshot: "greenaddressdesktop.png" - os: - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" - ios: - text: "walletgreenaddress" - link: "https://itunes.apple.com/app/id1206035886" - source: "https://github.com/greenaddress/WalletCordova" - screenshot: "greenaddressandroid.png" - os: - - android - - ios - check: - control: "checkpasscontrolmulti" - validation: "checkpassvalidationservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletgreenaddress" - link: "https://play.google.com/store/apps/details?id=it.greenaddress.cordova" - source: "https://github.com/greenaddress/WalletCordova" - screenshot: "greenaddressandroid.png" - os: - - android - - ios - check: - control: "checkpasscontrolmulti" - validation: "checkpassvalidationservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" -- coinspace: - title: "Coin.Space" - titleshort: "Coin.Space" - compat: "mobile web android windowsphone ios" - level: 3 - platform: - mobile: - text: "walletcoinspace" - link: "https://play.google.com/store/apps/details?id=com.coinspace.app" - source: "https://github.com/CoinSpace/CoinSpace" - screenshot: "coinspacemobile.png" - os: - - android - - ios - - windowsphone - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencynew" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletcoinspace" - link: "https://play.google.com/store/apps/details?id=com.coinspace.app" - source: "https://github.com/CoinSpace/CoinSpace" - screenshot: "coinspacemobile.png" - os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencynew" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - ios: - text: "walletcoinspace" - link: "https://itunes.apple.com/us/app/coinspace-bitcoin-wallet/id980719434?mt=8" - source: "https://github.com/CoinSpace/CoinSpace" - screenshot: "coinspacemobile.png" - os: - - ios - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencynew" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - windowsphone: - text: "walletcoinspace" - link: "https://www.microsoft.com/en-us/store/apps/coin-space-digital-currency-wallet/9nblgggz58z9" - source: "https://github.com/CoinSpace/CoinSpace" - screenshot: "coinspacemobile.png" - os: - - windowsphone - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencynew" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - web: - text: "walletcoinspace" - link: "https://coin.space" - source: "https://github.com/CoinSpace/CoinSpace" - screenshot: "coinspaceweb.png" - os: - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkfailenvironmentdesktop" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" -- coinbase: - title: "Coinbase" - titleshort: "Coinbase" - compat: "web" - level: 4 - platform: - web: - text: "walletcoinbase" - link: "https://coinbase.com" - screenshot: "coinbase.png" - os: - check: - control: "checkfailcontrolthirdparty" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkfailenvironmentdesktop" - privacy: "checkpassprivacybasic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" -- xapo: - title: "Xapo" - titleshort: "Xapo" - compat: "web" - level: 4 - platform: - web: - text: "walletxapo" - link: "https://xapo.com/" - screenshot: "xapo.png" - os: - check: - control: "checkfailcontrolthirdpartyinsured" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkfailenvironmentdesktop" - privacy: "checkpassprivacybasic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" -- coinapult: - title: "Coinapult" - titleshort: "Coinapult" - compat: "web" - level: 4 - platform: - web: - text: "walletcoinapult" - link: "https://coinapult.com/" - screenshot: "coinapult.png" - os: - check: - control: "checkfailcontrolthirdparty" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkfailenvironmentdesktop" - privacy: "checkpassprivacybasic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" -- keepkey: - title: "KeepKey" - titleshort: "KeepKey" - compat: "hardware" - level: 2 - platform: - hardware: - text: "walletkeepkey" - link: "https://www.keepkey.com/" - source: "https://github.com/keepkey/" - screenshot: "keepkey.png" - check: - control: "checkgoodcontrolfull" - validation: "checkneutralvalidationvariable" - transparency: "checkfailtransparencynew" - environment: "checkgoodenvironmenthardware" - privacy: "checkneutralprivacyvariable" - fees: "checkneutralfeecontrolvariable" -- simplebitcoinwallet: - title: "Simple Bitcoin Wallet" - titleshort: "Simple
Bitcoin" - compat: "mobile android" - level: 2 - platform: - mobile: - text: "walletsimplebitcoinwallet" - link: "https://play.google.com/store/apps/details?id=com.btcontract.wallet" - source: "https://github.com/btcontract/wallet" - screenshot: "simplebitcoinwalletandroid.png" - os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletsimplebitcoinwallet" - link: "https://play.google.com/store/apps/details?id=com.btcontract.wallet" - source: "https://github.com/btcontract/wallet" - screenshot: "simplebitcoinwalletandroid.png" - os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" -- arcbit: - title: "ArcBit" - titleshort: "ArcBit" - compat: "mobile desktop android ios windows mac linux" - level: 3 - platform: - mobile: - text: "walletarcbit" - link: "https://itunes.apple.com/app/arcbit-bitcoin-wallet/id999487888" - source: "https://github.com/arcbit/arcbit-ios" - screenshot: "arcbitios.png" - os: - - ios - - android - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroloverride" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkfailprivacynetworknosupporttor" - desktop: - text: "walletarcbit" - link: "https://chrome.google.com/webstore/detail/arcbit-bitcoin-wallet/dkceiphcnbfahjbomhpdgjmphnpgogfk" - source: "https://github.com/arcbit/arcbit-web" - screenshot: "arcbitdesktop.png" - os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkfailenvironmentdesktop" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroloverride" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkpassprivacynetworksupporttorproxy" - ios: - text: "walletarcbit" - link: "https://itunes.apple.com/app/arcbit-bitcoin-wallet/id999487888" - source: "https://github.com/arcbit/arcbit-ios" - screenshot: "arcbitios.png" - os: - - ios - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroloverride" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletarcbit" - link: "https://play.google.com/store/apps/details?id=com.arcbit.arcbit" - source: "https://github.com/arcbit/arcbit-android" - screenshot: "arcbitios.png" - os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroloverride" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkfailprivacynetworknosupporttor" -- btc.com: - title: "BTC.com Bitcoin Wallet" - titleshort: "BTC.com" - compat: "mobile web android ios" - level: 3 - platform: - mobile: - text: "walletbtccom" - link: "https://play.google.com/store/apps/details?id=com.blocktrail.mywallet" - source: "https://github.com/blocktrail/blocktrail-wallet" - screenshot: "btccomwallet.png" - os: - - android - - ios - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - web: - text: "walletbtccom" - link: "https://wallet.btc.com" - source: "https://github.com/blocktrail/blocktrail-webwallet" - screenshot: "btccomwallet.png" - os: - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" - ios: - text: "walletbtccom" - link: "https://itunes.apple.com/us/app/blocktrail-bitcoin-wallet/id1019614423" - source: "https://github.com/blocktrail/blocktrail-wallet" - screenshot: "btccomwallet.png" - os: - - ios - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletbtccom" - link: "https://play.google.com/store/apps/details?id=com.blocktrail.mywallet" - source: "https://github.com/blocktrail/blocktrail-wallet" - screenshot: "btccomwallet.png" - os: - - android - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" --- @@ -1143,7 +40,7 @@ wallets:
-{% for wallet in page.wallets %}{% for wallet in wallet %}{% if wallet[1].platform.mobile %}{% assign platform = wallet[1].platform.mobile %}{% elsif wallet[1].platform.desktop %}{% assign platform = wallet[1].platform.desktop %}{% elsif wallet[1].platform.hardware %}{% assign platform = wallet[1].platform.hardware %}{% else %}{% assign platform = wallet[1].platform.web %}{% endif %} +{% for wallet in site.wallets %}{% for wallet in wallet %}{% if wallet[1].platform.mobile %}{% assign platform = wallet[1].platform.mobile %}{% elsif wallet[1].platform.desktop %}{% assign platform = wallet[1].platform.desktop %}{% elsif wallet[1].platform.hardware %}{% assign platform = wallet[1].platform.hardware %}{% else %}{% assign platform = wallet[1].platform.web %}{% endif %}
From a9e2bad5f7e2aad7cfa86721d932e81e8b07edad Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Sat, 15 Jul 2017 17:18:01 +0200 Subject: [PATCH 07/37] Added platforms defaults to _config.yml --- _config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_config.yml b/_config.yml index 877c8d6e..37ee604b 100644 --- a/_config.yml +++ b/_config.yml @@ -600,6 +600,12 @@ defaults: - bcc - bcc news - RELEASE + - scope: + path: "" + type: platforms + values: + layout: base + - scope: path: "" type: posts From 4028e39d986e945ab0ca37afd79d7361f4b6762d Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Mon, 17 Jul 2017 15:32:56 +0200 Subject: [PATCH 08/37] WIP: Refactoring wallets styles to more maintainable structure --- _sass/_wallets.scss | 491 +++++++ _sass/screen.scss | 3334 ++++++++++++++++++------------------------- 2 files changed, 1901 insertions(+), 1924 deletions(-) create mode 100644 _sass/_wallets.scss diff --git a/_sass/_wallets.scss b/_sass/_wallets.scss new file mode 100644 index 00000000..f3d7e7ba --- /dev/null +++ b/_sass/_wallets.scss @@ -0,0 +1,491 @@ +$platforms: + mobile, + desktop, + hardware, + web; + +$oses: + ios, + android, + windowsphone, + blackberry, + linux, + mac, + windows; + +// Wallet menu +.walletmenu { + text-align: center; + position: relative; + z-index: 90; + + > ul { + display: inline-block; + text-align: left; + padding: 0 0 25px 0; + border-bottom: 1px solid #E2E2E2; + background-color: #fff; + + // Disable border radius of menu buttons + // TODO: rework, so it doesn't rely on the order of submenus + &:hover > li:first-child, + &:hover > li:first-child + li { + -webkit-border-bottom-left-radius: 0; + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-bottomleft: 0; + -moz-border-radius-bottomright: 0; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + } + + li { + font-family: 'Ubuntu', sans-serif; + position: relative; + display: inline-block; + background-repeat: no-repeat; + background-position: left 6px; + padding: 0; + margin: 15px 10px; + font-size: 130%; + font-weight: bold; + -moz-transition: background-color 400ms ease-out; + -webkit-transition: background-color 400ms ease-out; + transition: background-color 400ms ease-out; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + + &:first-child { + margin-left: 0; + } + + &:last-child { + margin-right: 0; + } + + a, + a:link, + a:active, + a:visited { + color: #383838; + } + a { + white-space: nowrap; + cursor: pointer; + display: block; + padding: 8px 10px 5px 42px; + } + + ul { + display: none; + position: absolute; + background-color: #fff; + border: 1px solid #0d579b; + padding: 4px 0; + min-width: 110%; + left: 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + + li { + font-size: 80%; + display: block; + margin: 0; + background-position: left 10px; + -webkit-border-radius: 0px; + -moz-border-radius: 0px; + border-radius: 0px; + + > a { + background-image: url(/img/icons/wallet_select.svg); + background-repeat: no-repeat; + background-position: -32px center; + padding: 8px 32px 5px 32px; + margin: 1px 0; + } + + &.active > a { + background-position: right center; + } + } + } + + &.active, + &:hover { + background-color: #0d579b; + } + + &:hover > a, + &:hover > a:link, + &:hover > a:active, + &:hover > a:visited, + &.active > a, + &.active > a:link, + &.active > a:active, + &.active > a:visited { + color: #fff; + } + } + } + + // Generating icon classes for platforms + @each $platform in $platforms { + .wallet-#{$platform} { + background-image: url('/img/icons/wallet_menu_#{$platform}.svg'); + } + } + + // Generating icon classes for OSes + @each $os in $oses { + .wallet-#{$os} { + background-image: url('/img/os/wallet_menu_#{$os}.svg'); + } + } +} +.walletmenu > ul > li.active, +.walletmenu > ul > li:hover { + background-position: left -62px; +} +.walletmenu > ul > li:hover > ul { + display: block; +} +.walletmenu > ul > li > ul > li.active, +.walletmenu > ul > li > ul > li:hover { + background-position: left -24px; +} + +.wallets { + width: 705px; + height: 250px; + text-align: left; + position: relative; + margin: auto; + padding: 60px 0 20px 0; + font-size: 0; + opacity: 1; + -moz-transition: opacity 400ms ease-out; + -webkit-transition: opacity 400ms ease-out; + transition: opacity 400ms ease-out; +} +.wallets.disabled { + opacity: 0; +} +.wallets > div { + display: inline-block; + vertical-align: top; + font-size: 16px; +} +.wallets > div:nth-child(1n + 15) { + display: none; +} +.wallets > div > a { + color: #2c6fad; + cursor: pointer; + font-size: 94%; + text-align: center; + text-decoration: none; + font-weight: bold; + width: 72px; + height: 110px; + display: inline-block; + vertical-align: top; + position: relative; + margin: 0 14px 20px 14px; + white-space: nowrap; + outline: 0; + -moz-transition: opacity 400ms ease-out; + -webkit-transition: opacity 400ms ease-out; + transition: opacity 400ms ease-out; +} +.wallets > div > a:hover { + color: #63a4e1; +} +.wallets > div > a > span { + display: none; + position: absolute; + z-index: 100; + height: 32px; + background: url(/img/icons/wallet_bubble.svg) no-repeat center 0; + top: 0; + left: 0; + right: 0; +} +.wallets > div > a > img { + display: block; + width: 72px; + height: 72px; + margin: auto; + margin-bottom: 5px; +} +.wallets > div > div, +.wallets > div > span { + opacity: 0; + width: 0; + height: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + position: absolute; + padding: 20px; + top: -382px; + left: -20px; + right: -20px; + -moz-transition: opacity 400ms ease-out; + -webkit-transition: opacity 400ms ease-out; + transition: opacity 400ms ease-out; +} +.wallets > div > span { + z-index: 100; + border: solid 2px #2c6faf; + background-color: #f1f8fb; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.wallets > div > div { + z-index: 102; +} +.wallets > div:nth-child(1n + 7) > div, +.wallets > div:nth-child(1n + 7) > span { + top: -252px; +} +.wallets > div:nth-child(1n + 13) > div, +.wallets > div:nth-child(1n + 13) > span { + top: -92px; +} +.wallets > div > div > h2 { + margin: 0; + text-align: left; + display: inline-block; +} +.wallets > div > div > h2:first-child + div { + display: inline-block; + margin-left: 10px; +} +.wallets > div > div > h2:first-child + div > img { + margin-left: 4px; +} +.wallets > div > div > h2:first-child + div + div > a { + display: inline-block; + text-decoration: none; + margin: 10px 0; + padding: 4px 8px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.wallets > div > div > h2:first-child + div + div > a:first-child { + font-weight: bold; + background-color: #2c6fad; + background-image: -o-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); + background-image: -moz-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); + background-image: -webkit-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); + background-image: -ms-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); + background-image: linear-gradient(bottom, #255f96 14%, #2c6fad 70%); + border: 1px solid #255f96; + margin-right: 10px; +} +.wallets > div > div > h2:first-child + div + div > a:first-child, +.wallets > div > div > h2:first-child + div + div > a:first-child:visited, +.wallets > div > div > h2:first-child + div + div > a:first-child:link, +.wallets > div > div > h2:first-child + div + div > a:first-child:active { + color: #fff; +} +.wallets > div > div > h2:first-child + div + div > a:first-child + a { + font-weight: normal; + color: #255f96; + border: 1px solid #255f96; +} +.wallets > div > div > h2:first-child + div + div > a:first-child + a, +.wallets > div > div > h2:first-child + div + div > a:first-child + a:visited, +.wallets > div > div > h2:first-child + div + div > a:first-child + a:link, +.wallets > div > div > h2:first-child + div + div > a:first-child + a:active { + color: #255f96; +} +.wallets > div > div > h2:first-child + div + div + div { + margin: 5px 0; +} +.wallets > div > div > h2:first-child + div + div + div > div { + padding: 5px 0 5px 22px; + background-repeat: no-repeat; + background-position: left 4px; + cursor: default; + line-height: 16px; +} +.wallets > div > div > h2:first-child + div + div + div > div > div { + display: inline-block; + background-image: url(/img/icons/wallet_help.png); + background-image: none, url(/img/icons/wallet_help.svg), url(/img/icons/wallet_help.png); + width: 16px; + height: 16px; + margin-left: 5px; + vertical-align: top; + position: relative; +} +.wallets > div > div > h2:first-child + div + div + div > div > div > span { + display: none; + position: absolute; + left: 6px; + top: -30px; + width: 25px; + height: 70px; + z-index: 90; + background-repeat: no-repeat; + background-position: right 30px; +} +.wallets > div > div > h2:first-child + div + div + div > div > div > p, +.wallets > div > div > h2:first-child + div + div + div > div > div > div { + opacity: 0; + width: 0; + height: 0; + overflow: hidden; + border: 1px solid; + visibility: hidden; + position: absolute; + background-color: #fff; + left: 30px; + margin: 0; + -moz-transition: opacity 400ms ease-out; + -webkit-transition: opacity 400ms ease-out; + transition: opacity 400ms ease-out; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + z-index: 90; +} +.wallets > div > div > h2:first-child + div + div + div > div > div > p { + font-size: 85%; + padding: 10px; + top: -30px; +} +.wallets > div > div > h2:first-child + div + div + div > div > div > div { + padding: 0 10px; + top: -80px; +} +.wallets > div > div > h2:first-child + div + div + div > div > div > div > div > p:first-child + p { + font-size: 85%; +} +.wallets > div > div > h2:first-child + div + div + div + p { + font-size: 95%; + margin: 0; + padding-right: 5px; + height: 137px; + width: 320px; + overflow: auto; +} +.wallets > div > div > h2:first-child + div + div + div + p + div { + position: absolute; + top: 20px; + right: 20px; + height: 400px; + width: 250px; +} +.wallets > div > div > h2:first-child + div + div + div + p + div > img { + border: 1px solid #BDBDBD; +} + +$checks: + control, + validation, + transparency, + environment, + fees, + privacy; + +$green: #329239; +$grey: #8b8b8b; +$red: #ee9209; + +$checkmarks: + good $green bold, + pass $green normal, + neutral $grey normal, + fail $red normal; + +.wallet { + + // Generate backgrounds for checks and checkmarks + @each $check in $checks { + @each $checkmark, $color, $font-weight in $checkmarks { + .check#{$checkmark} { + color: $color; + font-weight: $font-weight; + + p { + border-color: $color; + font-weight: normal; + } + + > div > span { + @if $checkmark == good { + background-image: url('/img/icons/checkbubble_pass.svg'); + } @else { + background-image: url('/img/icons/checkbubble_#{$checkmark}.svg'); + } + } + + &.check#{$check} { + @if $checkmark == good { + background-image: url('/img/icons/check_#{$check}_pass.svg'); + } @else { + background-image: url('/img/icons/check_#{$check}_#{$checkmark}.svg'); + } + } + } + } + } +} + +.wallets > div:hover > a > span, +.wallets > div.active > a > span, +.wallets.nohover > div.active:hover > a > span { + display: block; +} +.wallets.nohover > div:hover > a > span { + display: none; +} +.wallets > div:hover > div, +.wallets > div:hover > span, +.wallets > div.active > div, +.wallets > div.active > span, +.wallets.nohover > div.active:hover > div, +.wallets.nohover > div.active:hover > span { + opacity: 1; + width: auto; + height: 400px; + visibility: visible; + overflow: visible; +} +.wallets.nohover > div:hover > div, +.wallets.nohover > div:hover > span { + opacity: 0; + width: 0; + height: 0; + visibility: hidden; +} +.wallets > div > div > h2:first-child + div + div > a:first-child:hover { + background-image: none; +} +.wallets > div > div > h2:first-child + div + div + div > div:hover > div > span { + display: block; +} +.wallets > div > div > h2:first-child + div + div + div > div:hover > div > p, +.wallets > div > div > h2:first-child + div + div + div > div:hover > div > div { + opacity: 1; + width: 400px; + height: auto; + visibility: visible; +} + +.walletsswitch { + display: none; +} +.walletsmobile { + display: none; +} + +.walletsdisclaimer h2 { + text-align: center; +} + diff --git a/_sass/screen.scss b/_sass/screen.scss index e03e201f..5619e7fb 100644 --- a/_sass/screen.scss +++ b/_sass/screen.scss @@ -6,144 +6,144 @@ http://opensource.org/licenses/MIT. /*Styles for HTML tags*/ body{ - font-family:"Helvetica Neue", "Helvetica", Arial, sans-serif; - font-size:16px; - margin:0; - padding:0; - color:#646464; - background-color:#f7f7f7; + font-family:"Helvetica Neue", "Helvetica", Arial, sans-serif; + font-size:16px; + margin:0; + padding:0; + color:#646464; + background-color:#f7f7f7; } h1{ - font-family:'Ubuntu', sans-serif; - font-weight:700; - color:#0d579b; - font-size:160%; - margin-top:0; - text-align:center; + font-family:'Ubuntu', sans-serif; + font-weight:700; + color:#0d579b; + font-size:160%; + margin-top:0; + text-align:center; } h2{ - font-family:'Ubuntu', sans-serif; - font-weight:700; - color:#383838; - font-size:130%; - text-align:left; + font-family:'Ubuntu', sans-serif; + font-weight:700; + color:#383838; + font-size:130%; + text-align:left; } h3{ - color:#383838; - font-size:110%; - text-align:left; + color:#383838; + font-size:110%; + text-align:left; } a:link, a:visited, a:active, a.link-js{ - color:#2c6fad; - text-decoration:none; - cursor:pointer; + color:#2c6fad; + text-decoration:none; + cursor:pointer; } a:link:hover, a:visited:hover, a:active:hover, a.link-js:hover{ - color:#63a4e1; + color:#63a4e1; } a img, a:link img, a:visited img, a:active img{ - border:0; + border:0; } blockquote{ - margin-left:0; - border-left:5px solid #eee; - padding-left:15px; - font-size: 120%; + margin-left:0; + border-left:5px solid #eee; + padding-left:15px; + font-size: 120%; } pre{ - background-color:#f5f5f5; - display:block; - padding:17px; - line-height:1.5em; - font-size:75%; - border:1px solid #ccc; - white-space:pre; - overflow-y:auto; - -webkit-border-radius:3px; - -moz-border-radius:3px; - border-radius:3px; + background-color:#f5f5f5; + display:block; + padding:17px; + line-height:1.5em; + font-size:75%; + border:1px solid #ccc; + white-space:pre; + overflow-y:auto; + -webkit-border-radius:3px; + -moz-border-radius:3px; + border-radius:3px; } pre code{ - font-size:100%; - padding:0; - border:0; - white-space:pre; + font-size:100%; + padding:0; + border:0; + white-space:pre; } code{ - padding:2px 4px; - background-color:#f5f5f5; - font-size:85%; - white-space:nowrap; - border:1px solid #ccc; - -webkit-border-radius:3px; - -moz-border-radius:3px; - border-radius:3px; + padding:2px 4px; + background-color:#f5f5f5; + font-size:85%; + white-space:nowrap; + border:1px solid #ccc; + -webkit-border-radius:3px; + -moz-border-radius:3px; + border-radius:3px; } ul,ol{ - padding-left:20px; - margin-left:0; + padding-left:20px; + margin-left:0; } ul ul{ - list-style-type:disc; + list-style-type:disc; } li{ - margin:10px 0; + margin:10px 0; } table td,table th{ - padding:10px; - border:1px solid #ddd; + padding:10px; + border:1px solid #ddd; } /*Styles for whole website*/ @font-face{ - font-family:'Ubuntu'; - src:url('/font/ubuntu/ubuntu-r-webfont.eot'); - src:url('/font/ubuntu/ubuntu-r-webfont.eot?iefix') format('eot'), - url('/font/ubuntu/ubuntu-r-webfont.woff') format('woff'), - url('/font/ubuntu/ubuntu-r-webfont.ttf') format('truetype'), - url('/font/ubuntu/ubuntu-r-webfont.svg') format('svg'); - font-weight:300; - font-style:normal; + font-family:'Ubuntu'; + src:url('/font/ubuntu/ubuntu-r-webfont.eot'); + src:url('/font/ubuntu/ubuntu-r-webfont.eot?iefix') format('eot'), + url('/font/ubuntu/ubuntu-r-webfont.woff') format('woff'), + url('/font/ubuntu/ubuntu-r-webfont.ttf') format('truetype'), + url('/font/ubuntu/ubuntu-r-webfont.svg') format('svg'); + font-weight:300; + font-style:normal; } @font-face{ - font-family:'Ubuntu'; - src:url('/font/ubuntu/ubuntu-ri-webfont.eot'); - src:url('/font/ubuntu/ubuntu-ri-webfont.eot?iefix') format('eot'), - url('/font/ubuntu/ubuntu-ri-webfont.woff') format('woff'), - url('/font/ubuntu/ubuntu-ri-webfont.ttf') format('truetype'), - url('/font/ubuntu/ubuntu-ri-webfont.svg') format('svg'); - font-weight:300; - font-style:italic; + font-family:'Ubuntu'; + src:url('/font/ubuntu/ubuntu-ri-webfont.eot'); + src:url('/font/ubuntu/ubuntu-ri-webfont.eot?iefix') format('eot'), + url('/font/ubuntu/ubuntu-ri-webfont.woff') format('woff'), + url('/font/ubuntu/ubuntu-ri-webfont.ttf') format('truetype'), + url('/font/ubuntu/ubuntu-ri-webfont.svg') format('svg'); + font-weight:300; + font-style:italic; } @font-face{ - font-family:'Ubuntu'; - src:url('/font/ubuntu/ubuntu-b-webfont.eot'); - src:url('/font/ubuntu/ubuntu-b-webfont.eot?iefix') format('eot'), - url('/font/ubuntu/ubuntu-b-webfont.woff') format('woff'), - url('/font/ubuntu/ubuntu-b-webfont.ttf') format('truetype'), - url('/font/ubuntu/ubuntu-b-webfont.svg') format('svg'); - font-weight:700; - font-style:normal; + font-family:'Ubuntu'; + src:url('/font/ubuntu/ubuntu-b-webfont.eot'); + src:url('/font/ubuntu/ubuntu-b-webfont.eot?iefix') format('eot'), + url('/font/ubuntu/ubuntu-b-webfont.woff') format('woff'), + url('/font/ubuntu/ubuntu-b-webfont.ttf') format('truetype'), + url('/font/ubuntu/ubuntu-b-webfont.svg') format('svg'); + font-weight:700; + font-style:normal; } @font-face{ - font-family:'Ubuntu'; - src:url('/font/ubuntu/ubuntu-bi-webfont.eot'); - src:url('/font/ubuntu/ubuntu-bi-webfont.eot?iefix') format('eot'), - url('/font/ubuntu/ubuntu-bi-webfont.woff') format('woff'), - url('/font/ubuntu/ubuntu-bi-webfont.ttf') format('truetype'), - url('/font/ubuntu/ubuntu-bi-webfont.svg') format('svg'); - font-weight:700; - font-style:italic; + font-family:'Ubuntu'; + src:url('/font/ubuntu/ubuntu-bi-webfont.eot'); + src:url('/font/ubuntu/ubuntu-bi-webfont.eot?iefix') format('eot'), + url('/font/ubuntu/ubuntu-bi-webfont.woff') format('woff'), + url('/font/ubuntu/ubuntu-bi-webfont.ttf') format('truetype'), + url('/font/ubuntu/ubuntu-bi-webfont.svg') format('svg'); + font-weight:700; + font-style:italic; } .banner-message, @@ -151,218 +151,218 @@ table td,table th{ .banner-message a:link, .banner-message a:active, .banner-message a:visited{ - display:block; - color:#fff; + display:block; + color:#fff; } .banner-message a:hover{ - text-decoration:underline; + text-decoration:underline; } .banner-message a{ - background-color:#c5251f; + background-color:#c5251f; } .banner-message.alert a{ - background-color:#c5251f; + background-color:#c5251f; } .banner-message.warning a{ - background-color:#E58716; + background-color:#E58716; } .banner-message.success a{ - background-color:#329239; + background-color:#329239; } .banner-message.info a{ - background-color:#0d579b; + background-color:#0d579b; } .banner-message.minor a{ - background-color: yellow; + background-color: yellow; color: black; } .banner-message a span{ - display:block; - margin:auto; - width:850px; - padding:10px; - text-align: center; + display:block; + margin:auto; + width:850px; + padding:10px; + text-align: center; } .center { - text-align: center; + text-align: center; margin-right: auto; margin-left: auto; } .head{ - margin:30px 0 30px 0; + margin:30px 0 30px 0; } .head div{ - width:940px; - margin:auto; - position:relative; - z-index:100; + width:940px; + margin:auto; + position:relative; + z-index:100; } .body{ - width:940px; - margin:auto; - position:relative; + width:940px; + margin:auto; + position:relative; } .langselect{ - display:none; + display:none; } .lang, .lang li, .lang ul{ - display:block; - list-style:none; - padding:0; - margin:0; - cursor:pointer; + display:block; + list-style:none; + padding:0; + margin:0; + cursor:pointer; } .lang{ - position:absolute; - right:5px; - top:8px; - border-left:2px solid transparent; - border-right:2px solid transparent; - border-top:2px solid transparent; + position:absolute; + right:5px; + top:8px; + border-left:2px solid transparent; + border-right:2px solid transparent; + border-top:2px solid transparent; } .lang:hover{ - border-left:2px solid #ebebeb; - border-right:2px solid #ebebeb; - border-top:2px solid #ebebeb; - background-color:#fff; + border-left:2px solid #ebebeb; + border-right:2px solid #ebebeb; + border-top:2px solid #ebebeb; + background-color:#fff; } .lang li ul{ - display:none; - right:-2px; - position:absolute; - background-color:#fff; - padding:20px; - border:2px solid #ebebeb; - white-space:nowrap; + display:none; + right:-2px; + position:absolute; + background-color:#fff; + padding:20px; + border:2px solid #ebebeb; + white-space:nowrap; } .lang:hover li ul{ - display:block; + display:block; } .lang li ul li{ - display:inline-block; - vertical-align:top; - text-align:left; - width:180px; + display:inline-block; + vertical-align:top; + text-align:left; + width:180px; } .lang li ul li ul{ - position:relative; - margin:-4px 0; - padding:0; - border:0; - top:0; + position:relative; + margin:-4px 0; + padding:0; + border:0; + top:0; } .lang li ul li ul li{ - display:block; + display:block; } .lang li a, .lang li a:link, .lang li a:visited, .lang li a:active{ - text-decoration:none; - font-size:115%; - display:inline-block; - color:#b8b8b8; - padding:4px 8px; + text-decoration:none; + font-size:115%; + display:inline-block; + color:#b8b8b8; + padding:4px 8px; } .lang li ul li a, .lang li ul li a:link, .lang li ul li a:visited, .lang li ul li a:active{ - padding:4px 0; - width:180px; + padding:4px 0; + width:180px; } .lang:hover li a, .lang li ul li ul li:hover a, .lang li ul li ul li a.active{ - color:#666666; + color:#666666; } .lang:hover li ul li a{ - color:#b8b8b8; + color:#b8b8b8; } .logo{ - display:block; - margin-left:40px; - width:191px; - height:40px; + display:block; + margin-left:40px; + width:191px; + height:40px; } .menumobile{ - display:none; + display:none; } .menusimple{ - margin:0; - position:absolute; - top:8px; - left:245px; - padding:0; - height:35px; + margin:0; + position:absolute; + top:8px; + left:245px; + padding:0; + height:35px; } .menusimple li{ - list-style:none; - display:inline-block; - position:relative; - padding:0; - margin:0 3px; - -webkit-border-radius:5px; - -moz-border-radius:5px; - border-radius:5px; + list-style:none; + display:inline-block; + position:relative; + padding:0; + margin:0 3px; + -webkit-border-radius:5px; + -moz-border-radius:5px; + border-radius:5px; } .menusimple>li a, .menusimple>li a:active, .menusimple>li a:visited, .menusimple>li a:link{ - color:#2c6fad; + color:#2c6fad; } .menusimple>li a{ - cursor:pointer; - font-family:'Ubuntu', sans-serif; - font-weight:300; - font-size:110%; - display:block; - text-decoration:none; - padding:6px 10px 4px 10px; - white-space:nowrap; + cursor:pointer; + font-family:'Ubuntu', sans-serif; + font-weight:300; + font-size:110%; + display:block; + text-decoration:none; + padding:6px 10px 4px 10px; + white-space:nowrap; } .menusimple>li ul{ - display:none; - position:absolute; - background-color:#fff; - border:1px solid #2c6fad; - min-width:120%; - padding:5px 0; - margin:0; - left:0; + display:none; + position:absolute; + background-color:#fff; + border:1px solid #2c6fad; + min-width:120%; + padding:5px 0; + margin:0; + left:0; } .menusimple>li>ul li{ - margin:0; - display:block; - width:100%; - -webkit-border-radius:0; - -moz-border-radius:0; - border-radius:0; + margin:0; + display:block; + width:100%; + -webkit-border-radius:0; + -moz-border-radius:0; + border-radius:0; } .menusimple>li>ul>li a{ - font-size:100%; - margin:1px 0; - padding:6px 10px 3px 10px; + font-size:100%; + margin:1px 0; + padding:6px 10px 3px 10px; } .menusimple li:hover, .menusimple li.active{ - background-color:#2c6fad; + background-color:#2c6fad; } .menusimple li:hover>a, .menusimple li.active>a{ - color:#fff; + color:#fff; } .menusimple li:hover>ul{ - display:block; + display:block; } .menusimple.menumain>li:first-child, @@ -370,92 +370,92 @@ table td,table th{ .menusimple.menumain>li:first-child+li+li+li, .menusimple.menucore>li:first-child, .menusimple.menucore>li:first-child+li+li{ - -webkit-border-bottom-left-radius:0; - -webkit-border-bottom-right-radius:0; - -moz-border-radius-bottomleft:0; - -moz-border-radius-bottomright:0; - border-bottom-left-radius:0; - border-bottom-right-radius:0; + -webkit-border-bottom-left-radius:0; + -webkit-border-bottom-right-radius:0; + -moz-border-radius-bottomleft:0; + -moz-border-radius-bottomright:0; + border-bottom-left-radius:0; + border-bottom-right-radius:0; } .menusimple.menucore>li:first-child+li+li+li+li a{ - font-weight: 700; + font-weight: 700; } .breadcrumbs { - font-size: 75%; - padding-left: 10px; + font-size: 75%; + padding-left: 10px; } .content{ - position:relative; - padding:30px 40px 40px 40px; - margin:0 5px; - text-align:justify; - background-color:#fff; - min-height:400px; - border:2px solid #ebebeb; - -webkit-border-radius:6px; - -moz-border-radius:6px; - border-radius:6px; + position:relative; + padding:30px 40px 40px 40px; + margin:0 5px; + text-align:justify; + background-color:#fff; + min-height:400px; + border:2px solid #ebebeb; + -webkit-border-radius:6px; + -moz-border-radius:6px; + border-radius:6px; } .content p, .content li, .content table{ - line-height:1.5em; + line-height:1.5em; } h1 span.fa, h2 span.fa, h3 span.fa, h4 span.fa, h5 span.fa, h6 span.fa { - margin-right: 10px; + margin-right: 10px; } .footer{ - text-align:center; - width:940px; - margin:auto; + text-align:center; + width:940px; + margin:auto; } .footermenu{ - position:relative; - padding:0 0 20px 0; - font-size:94%; + position:relative; + padding:0 0 20px 0; + font-size:94%; } .footermenu a{ - margin-right:15px; - white-space:nowrap; + margin-right:15px; + white-space:nowrap; } .footersponsor div{ - display:inline-block; - color:#8D8D8D; - margin:0 0 25px 0; - line-height:2em; + display:inline-block; + color:#8D8D8D; + margin:0 0 25px 0; + line-height:2em; } .footersponsor span{ - white-space:nowrap; + white-space:nowrap; } .footersponsor span, .footersponsor a, .footersponsor a:link, .footersponsor a:active, .footersponsor a:visited{ - display:inline-block; - margin:5px; + display:inline-block; + margin:5px; } .footersponsor img{ - width:245px; - height:18px; + width:245px; + height:18px; } .footerlicense{ - font-size:94%; - padding-bottom:20px; + font-size:94%; + padding-bottom:20px; } .statusmenu{ - display:inline-block; - padding-left:20px; - background-position:left center; - background-repeat:no-repeat; - background-image:url(/img/icons/netstatus_normal.svg); + display:inline-block; + padding-left:20px; + background-position:left center; + background-repeat:no-repeat; + background-image:url(/img/icons/netstatus_normal.svg); } .statusmenu.alert{ - background-image:url(/img/icons/netstatus_alert.svg); + background-image:url(/img/icons/netstatus_alert.svg); } /*Styles specific to elements in pages*/ @@ -463,404 +463,404 @@ h1 span.fa, h2 span.fa, h3 span.fa, h4 span.fa, h5 span.fa, h6 span.fa { .mainsummary, .mainvideo, .mainlist{ - text-align:center; + text-align:center; } .mainsummary{ - font-size:145%; - color:#7b7c7c; - margin:20px auto 45px auto; + font-size:145%; + color:#7b7c7c; + margin:20px auto 45px auto; } .mainvideo{ - position:relative; - margin:auto; - max-width:640px; - max-height:360px; + position:relative; + margin:auto; + max-width:640px; + max-height:360px; } .mainvideo iframe, .mainvideo img{ - width:640px; - height:360px; + width:640px; + height:360px; } .mainvideo div div{ - cursor:pointer; - position:absolute; - top:0; - left:0; - right:0; - bottom:0; + cursor:pointer; + position:absolute; + top:0; + left:0; + right:0; + bottom:0; } .mainvideo .mainvideoicon{ - display:block; - background:url(/img/icons/video_play.svg) center center no-repeat; + display:block; + background:url(/img/icons/video_play.svg) center center no-repeat; } .mainvideo .mainvideoiconhover{ - display:none; - background:url(/img/icons/video_play_hover.svg) center center no-repeat; + display:none; + background:url(/img/icons/video_play_hover.svg) center center no-repeat; } .mainvideo:hover .mainvideoicon{ - display:none; + display:none; } .mainvideo:hover .mainvideoiconhover{ - display:block; + display:block; } .mainlist{ - font-size:125%; - max-width:760px; - margin:30px auto; - display:table; + font-size:125%; + max-width:760px; + margin:30px auto; + display:table; } .mainlist>div{ - display:table-cell; - width:240px; - min-width:200px; - text-align:center; + display:table-cell; + width:240px; + min-width:200px; + text-align:center; } .mainlist>div>div{ - display:inline-block; - line-height:1.5em; + display:inline-block; + line-height:1.5em; } .mainlist>div>div>div{ - display:inline-block; + display:inline-block; } .mainlist img{ - display:block; - margin:10px auto; - vertical-align:top; - position:relative; - height:48px; - width:48px; + display:block; + margin:10px auto; + vertical-align:top; + position:relative; + height:48px; + width:48px; } .maindesc{ - max-width:760px; - margin:auto; - line-height:1.5em; + max-width:760px; + margin:auto; + line-height:1.5em; } .mainbutton{ - text-align:center; + text-align:center; } .mainbutton a, .mainbutton a:link, .mainbutton a:visited, .mainbutton a:active{ - font-family:'Ubuntu', sans-serif; - font-weight:400; - font-size:150%; - text-shadow:0 2px 6px rgba(0,0,0,0.6); - text-align:left; - display:inline-block; - background-color:#2c6fad; - border:1px solid #20598f; - background-image:-o-linear-gradient(bottom, #20598f 14%, #2c6fad 70%); - background-image:-moz-linear-gradient(bottom, #20598f 14%, #2c6fad 70%); - background-image:-webkit-linear-gradient(bottom, #20598f 14%, #2c6fad 70%); - background-image:-ms-linear-gradient(bottom, #20598f 14%, #2c6fad 70%); - background-image:linear-gradient(bottom, #20598f 14%, #2c6fad 70%); - color:#fff; - padding:15px 20px 20px 68px; - margin:40px 0 40px 0; - -webkit-border-radius:12px; - -moz-border-radius:12px; - border-radius:12px; + font-family:'Ubuntu', sans-serif; + font-weight:400; + font-size:150%; + text-shadow:0 2px 6px rgba(0,0,0,0.6); + text-align:left; + display:inline-block; + background-color:#2c6fad; + border:1px solid #20598f; + background-image:-o-linear-gradient(bottom, #20598f 14%, #2c6fad 70%); + background-image:-moz-linear-gradient(bottom, #20598f 14%, #2c6fad 70%); + background-image:-webkit-linear-gradient(bottom, #20598f 14%, #2c6fad 70%); + background-image:-ms-linear-gradient(bottom, #20598f 14%, #2c6fad 70%); + background-image:linear-gradient(bottom, #20598f 14%, #2c6fad 70%); + color:#fff; + padding:15px 20px 20px 68px; + margin:40px 0 40px 0; + -webkit-border-radius:12px; + -moz-border-radius:12px; + border-radius:12px; } .mainbutton a:hover{ - background-image:none; - color:#fff; + background-image:none; + color:#fff; } .mainbutton img{ - margin-right:10px; - margin-left:-52px; - margin-bottom:-12px; - height:42px; - width:42px; + margin-right:10px; + margin-left:-52px; + margin-bottom:-12px; + height:42px; + width:42px; } .mainoverview{ - font-size:130%; - text-align:center; - margin-bottom:10px; + font-size:130%; + text-align:center; + margin-bottom:10px; } .mainoverviews{ - font-size:145%; - text-align:center; - margin-bottom:10px; + font-size:145%; + text-align:center; + margin-bottom:10px; } .mainoverviews a{ - margin:5px 15px; - display:inline-block; + margin:5px 15px; + display:inline-block; } .starttitle{ - text-align:center; + text-align:center; } .starttitle span{ - padding:10px; - border-bottom:1px solid #E2E2E2; - font-size:155%; - margin:20px auto; - display:inline-block; + padding:10px; + border-bottom:1px solid #E2E2E2; + font-size:155%; + margin:20px auto; + display:inline-block; } .start{ - text-align:left; + text-align:left; } .start div{ - position:relative; + position:relative; } .start>div:first-child+div{ - border-top:1px solid #e0e0e0; + border-top:1px solid #e0e0e0; } .start div div{ - display:inline-block; - width:380px; - vertical-align:top; - padding-bottom:70px; - position:static; + display:inline-block; + width:380px; + vertical-align:top; + padding-bottom:70px; + position:static; } .start>div>div:first-child{ - padding-right:40px; - border-right:1px solid #e0e0e0; + padding-right:40px; + border-right:1px solid #e0e0e0; } .start>div>div:first-child+div{ - padding-left:40px; - border-left:1px solid #e0e0e0; - margin-left:-1px; + padding-left:40px; + border-left:1px solid #e0e0e0; + margin-left:-1px; } .start div div div a, .start div div div a:link, .start div div div a:active, .start div div div a:visited{ - display:inline-block; - padding:6px 12px; - font-size:115%; - color:#fff; - border:1px solid #d57700; - background-color:#ee9209; - background-image:-o-linear-gradient(bottom, #e28700 14%, #ee9209 70%); - background-image:-moz-linear-gradient(bottom, #e28700 14%, #ee9209 70%); - background-image:-webkit-linear-gradient(bottom, #e28700 14%, #ee9209 70%); - background-image:-ms-linear-gradient(bottom, #e28700 14%, #ee9209 70%); - background-image:linear-gradient(bottom, #e28700 14%, #ee9209 70%); - -webkit-border-radius:3px; - -moz-border-radius:3px; - border-radius:3px; + display:inline-block; + padding:6px 12px; + font-size:115%; + color:#fff; + border:1px solid #d57700; + background-color:#ee9209; + background-image:-o-linear-gradient(bottom, #e28700 14%, #ee9209 70%); + background-image:-moz-linear-gradient(bottom, #e28700 14%, #ee9209 70%); + background-image:-webkit-linear-gradient(bottom, #e28700 14%, #ee9209 70%); + background-image:-ms-linear-gradient(bottom, #e28700 14%, #ee9209 70%); + background-image:linear-gradient(bottom, #e28700 14%, #ee9209 70%); + -webkit-border-radius:3px; + -moz-border-radius:3px; + border-radius:3px; } .start div div div a:hover{ - background-image:none; - color:#fff; + background-image:none; + color:#fff; } .start h2{ - color:#0d579b; + color:#0d579b; } .start h2 span{ - font-size:200%; - color:#ee9209; + font-size:200%; + color:#ee9209; } .start div div div{ - display:block; - width:auto; - padding-bottom:0; - position:absolute; - bottom:35px; + display:block; + width:auto; + padding-bottom:0; + position:absolute; + bottom:35px; } .starttitle a{ - margin:0 20px auto; + margin:0 20px auto; } .introlink{ - text-align:center; - font-size:125%; - font-weight:bold; - margin-top:30px; + text-align:center; + font-size:125%; + font-weight:bold; + margin-top:30px; } .titleicon{ - width:32px; - height:32px; - vertical-align:middle; - margin-right:8px; - position:relative; - top:-2px; + width:32px; + height:32px; + vertical-align:middle; + margin-right:8px; + position:relative; + top:-2px; } .warningicon{ - width:42px; - height:42px; - vertical-align:middle; - margin-right:6px; + width:42px; + height:42px; + vertical-align:middle; + margin-right:6px; } .index, .index ul, .index li{ - list-style:none; - padding:0; - margin:0; + list-style:none; + padding:0; + margin:0; } .index{ - padding:10px 20px; - border:2px dashed #4892b2; - display:inline-block; + padding:10px 20px; + border:2px dashed #4892b2; + display:inline-block; } .index ul{ - margin:10px 0; + margin:10px 0; } .index li a{ - font-weight:bold; + font-weight:bold; } .index ul ul li a{ - font-weight:normal; + font-weight:normal; } .index a, .index a:link, .index a:active, .index a:visited{ - display:block; - text-decoration:none; - line-height:1.5em; + display:block; + text-decoration:none; + line-height:1.5em; } .docreference{ - text-align:center; + text-align:center; } .docreference a{ - display:inline-block; - margin:20px 0 40px 0; - font-size:115%; - width:150px; + display:inline-block; + margin:20px 0 40px 0; + font-size:115%; + width:150px; } .docreference img{ - display:block; - height:48px; - width:48px; - margin:0 auto 10px auto; + display:block; + height:48px; + width:48px; + margin:0 auto 10px auto; } .docreference span{ - display:block; - line-height:1.5em; + display:block; + line-height:1.5em; } .toc{ - position:absolute; - left:20px; - text-align:left; - padding-top:40px; - margin-top:-40px; + position:absolute; + left:20px; + text-align:left; + padding-top:40px; + margin-top:-40px; } .toc div{ - overflow-y:auto; - overflow-x:hidden; - width:240px; + overflow-y:auto; + overflow-x:hidden; + width:240px; } .toc div.scroll{ - position:fixed; + position:fixed; } .toc ul, .toc li{ - list-style:none; - padding:0; - margin:0; + list-style:none; + padding:0; + margin:0; } .toc ul{ - width:220px; - border-right:1px solid #e0e0e0; - padding:0 19px 0 0; + width:220px; + border-right:1px solid #e0e0e0; + padding:0 19px 0 0; } .toc ul li{ - padding:0 0 10px 0; + padding:0 0 10px 0; } .toc ul li ul{ - position:relative; - top:0; - padding:10px 0 0 0; - border:0; - display:none; + position:relative; + top:0; + padding:10px 0 0 0; + border:0; + display:none; } .toc ul li.active ul{ - display:block; + display:block; } .toc ul li ul li{ - padding:0 0 4px 0; + padding:0 0 4px 0; } .toc ul li ul li ul li{ - padding-left:10px; + padding-left:10px; } .toc ul li a{ - padding-left:20px; - font-weight:bold; + padding-left:20px; + font-weight:bold; } .toc ul li ul li a{ - font-weight:normal; + font-weight:normal; } .toc ul li ul li a:hover:before, .toc ul li ul li a.active:before{ - content:">"; - position:absolute; - font-weight:bold; - left:0px; + content:">"; + position:absolute; + font-weight:bold; + left:0px; } .toc ul.goback{ - padding-top:8px; + padding-top:8px; } .toc ul.goback li{ - background:url(/img/icons/mini_ico_back.svg) no-repeat 0 3px; + background:url(/img/icons/mini_ico_back.svg) no-repeat 0 3px; } .toc ul.reportissue li{ - background:url(/img/icons/mini_ico_report.svg) no-repeat 0 3px; + background:url(/img/icons/mini_ico_report.svg) no-repeat 0 3px; } .toc ul.editsource li{ - background:url(/img/icons/mini_ico_rev.svg) no-repeat 0 3px; + background:url(/img/icons/mini_ico_rev.svg) no-repeat 0 3px; } .toc a, .toc a:link, .toc a:active, .toc a:visited{ - display:block; - text-decoration:none; - line-height:1.5em; + display:block; + text-decoration:none; + line-height:1.5em; } .toccontent{ - width:600px; - margin:auto 0 auto auto; - position:relative; - text-align: left; + width:600px; + margin:auto 0 auto auto; + position:relative; + text-align: left; } .toccontent h2, .toccontent h3, .toccontent h4, .toccontent h5, .toccontent h6{ - color:#383838; - margin-top: 40px; - margin-bottom: 0; + color:#383838; + margin-top: 40px; + margin-bottom: 0; } .toccontent h2{ - font-size:150%; + font-size:150%; } .toccontent h3{ - font-size:130%; + font-size:130%; } .toccontent h4{ - font-size:110%; + font-size:110%; } .toccontent h5,.toccontent h6{ - font-size:100%; + font-size:100%; } .toccontent img{ - max-width:100%; + max-width:100%; } .toccontent table thead{ - text-align:center; + text-align:center; } .toccontent a.auto-link:link, .toccontent a.auto-link:visited{ - color:#646464; + color:#646464; } .toccontent:hover a.auto-link:link, .toccontent:hover a.auto-link:visited{ - color:#2c6fad; + color:#2c6fad; } .toccontent:hover a.auto-link:link:hover, .toccontent:hover a.auto-link:visited:hover{ - color:#63a4e1; + color:#63a4e1; } .toccontent .subhead-links{ - padding-top: 7px; + padding-top: 7px; } .toccontent a:link.term, .toccontent a:visited.term, @@ -868,119 +868,119 @@ h1 span.fa, h2 span.fa, h3 span.fa, h4 span.fa, h5 span.fa, h6 span.fa { .toccontent:hover a.auto-link.term:visited, .toccontent:hover a.auto-link.term:link:hover, .toccontent:hover a.auto-link.term:visited:hover{ - color:#000; + color:#000; } .toccontent a.term:link code, .toccontent a.term:visited code{ - color:#646464; + color:#646464; } .multicode{ - background-color:#f5f5f5; - overflow-y:auto; - padding:17px; - border:1px solid #ccc; - -webkit-border-radius:3px; - -moz-border-radius:3px; - border-radius:3px; + background-color:#f5f5f5; + overflow-y:auto; + padding:17px; + border:1px solid #ccc; + -webkit-border-radius:3px; + -moz-border-radius:3px; + border-radius:3px; } .multicode pre{ - border:0px none; - padding:0; - margin:0; - overflow-y:visible; + border:0px none; + padding:0; + margin:0; + overflow-y:visible; } .toccontent table.ntpd tr td+td+td{ - white-space:nowrap; + white-space:nowrap; } .toccontent table.ntpd tr td+td+td+td{ - white-space:normal; + white-space:normal; } .toccontent table thead th{ - font-weight:normal; - border-bottom: 3px double #ddd; + font-weight:normal; + border-bottom: 3px double #ddd; } .anchorAf{ - position:relative; + position:relative; } .anchorAf a:first-child{ - display:none; - position:absolute; - width:24px; - left:-24px; - bottom:0; - top:0; - background:url(/img/icons/mini_ico_anchor.svg) no-repeat center center; + display:none; + position:absolute; + width:24px; + left:-24px; + bottom:0; + top:0; + background:url(/img/icons/mini_ico_anchor.svg) no-repeat center center; } .anchorAf:hover a:first-child{ - display:block; + display:block; } .ui-dialog .anchorAf:hover a:first-child{ - display:none; + display:none; } .develdocdisclaimer{ - padding:30px 0; - background:#fff; - bottom:0; - position:fixed; - width:600px; - z-index:1000; - border-top:1px solid #e0e0e0; + padding:30px 0; + background:#fff; + bottom:0; + position:fixed; + width:600px; + z-index:1000; + border-top:1px solid #e0e0e0; } .develdocdisclaimer div{ - border:2px dashed #ee9209; - background:#fff8ea; - padding:10px; - line-height:1.5em; - position:relative; + border:2px dashed #ee9209; + background:#fff8ea; + padding:10px; + line-height:1.5em; + position:relative; } .develdocdisclaimerclose, .develdocdisclaimerclose:visited, .develdocdisclaimerclose:link, .develdocdisclaimerclose:active{ - display:block; - padding:1px 8px 0 8px; - color:#fff; - background-color:#ee9209; - position:absolute; - top:-14px; - right:-14px; - font-weight:bold; - cursor:pointer; - border:2px solid #fff; - -webkit-border-radius:20px; - -moz-border-radius:20px; - border-radius:20px; + display:block; + padding:1px 8px 0 8px; + color:#fff; + background-color:#ee9209; + position:absolute; + top:-14px; + right:-14px; + font-weight:bold; + cursor:pointer; + border:2px solid #fff; + -webkit-border-radius:20px; + -moz-border-radius:20px; + border-radius:20px; } .develdocdisclaimerclose:hover, .develdocdisclaimerclose:visited:hover, .develdocdisclaimerclose:link:hover, .develdocdisclaimerclose:active:hover{ - border:2px solid #ee9209; - color:#fff; + border:2px solid #ee9209; + color:#fff; } .glossary_term { - display: block; - width: 20em; - padding: 5px 10px; - margin-right: auto; - margin-left: auto; + display: block; + width: 20em; + padding: 5px 10px; + margin-right: auto; + margin-left: auto; } .ui-autocomplete-category { - font-weight: bold; - padding: .2em .4em; - margin: .8em 0 .2em; - line-height: 1.5; + font-weight: bold; + padding: .2em .4em; + margin: .8em 0 .2em; + line-height: 1.5; } ul.wrapped_list li { - list-style: none; - float: left; - width: 15em; - margin: 1em; + list-style: none; + float: left; + width: 15em; + margin: 1em; } br.clear { - clear: left; + clear: left; } .notice { text-align: center; @@ -989,11 +989,11 @@ br.clear { font-style: italic; } .subhead-links { - font-size: 85%; + font-size: 85%; } .subhead-links img { - width: 12px; - height: 12px; + width: 12px; + height: 12px; } div.one-column { @@ -1035,7 +1035,7 @@ div.post { } table.privacy-comparison td,table.privacy-comparison th{ - padding:3px; + padding:3px; } table.privacy-comparison tr.empty { @@ -1043,7 +1043,7 @@ table.privacy-comparison tr.empty { } table.privacy-comparison td:nth-child(1n+2) { - width: 120px; + width: 120px; } table.validation { width: 100%; } @@ -1056,10 +1056,10 @@ table.validation .ui-icon { display: inline-block; } table.validation tr:nth-child(even)>td { - cursor:pointer; + cursor:pointer; } table.validation tr:nth-child(even)>td:hover { - color:#000; + color:#000; } .received_transactions td { @@ -1071,8 +1071,8 @@ table.validation tr:nth-child(even)>td:hover { } .service-choose a{ - display: block; - margin: 20px 0; + display: block; + margin: 20px 0; } button.js.showcolumn { @@ -1130,13 +1130,13 @@ br.big { background: transparent; border: 0; font-size: 150%; - -webkit-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; } .slide-buttons button.active { - background-color: #2c6fad; - color: #fff; + background-color: #2c6fad; + color: #fff; } .two-column-list ul { @@ -1178,7 +1178,7 @@ button.active { } .prevnext { - line-height: 1.5em; + line-height: 1.5em; } .prevnext span:first-child { float: left; @@ -1300,65 +1300,65 @@ button.active { } .box{ - border:2px dashed #4892b2; - padding:0 20px 0 20px; + border:2px dashed #4892b2; + padding:0 20px 0 20px; } .boxexpand{ - overflow:hidden; - -moz-transition:height 400ms ease-out; - -webkit-transition:height 400ms ease-out; - transition:height 400ms ease-out; + overflow:hidden; + -moz-transition:height 400ms ease-out; + -webkit-transition:height 400ms ease-out; + transition:height 400ms ease-out; } .boxexpand>*{ - display:none; + display:none; } .boxexpand>h3:first-child{ - display:block; - margin:20px 0; + display:block; + margin:20px 0; } .boxexpand>h3:first-child a:link, .boxexpand>h3:first-child a:visited, .boxexpand>h3:first-child a:active{ - text-decoration:none; + text-decoration:none; } .boxexpand.expanded>*{ - display:block; + display:block; } .titlelight{ - color:#8c8c8c; + color:#8c8c8c; } .tablehalf{ - width:885px; - position:relative; - left:-40px; + width:885px; + position:relative; + left:-40px; } .tablehalf div{ - display:inline-block; - width:400px; - vertical-align:top; - margin-left:40px; - margin-bottom:20px; + display:inline-block; + width:400px; + vertical-align:top; + margin-left:40px; + margin-bottom:20px; } .tablehalf img{ - width:400px; - height:220px; - -webkit-border-radius:10px; - -moz-border-radius:10px; - border-radius:10px; + width:400px; + height:220px; + -webkit-border-radius:10px; + -moz-border-radius:10px; + border-radius:10px; } .tablehalf h2 img{ - width:auto; - height:auto; + width:auto; + height:auto; } .tablehalf p{ - text-align:left; + text-align:left; } .contributors{ - width:890px; - text-align:left; - font-size:80%; + width:890px; + text-align:left; + font-size:80%; } .one-column .contributors { @@ -1366,1622 +1366,1108 @@ button.active { } .contributors img{ - width:16px; - height:16px; + width:16px; + height:16px; } .contributors div{ - padding:8px 0; - width:215px; - overflow:hidden; - display:inline-block; - vertical-align:top; + padding:8px 0; + width:215px; + overflow:hidden; + display:inline-block; + vertical-align:top; } .contributors div div{ - width:auto; - padding:0; + width:auto; + padding:0; } .contributors div div:first-child+div{ - max-width:150px; - margin:0 2px; - white-space:nowrap; + max-width:150px; + margin:0 2px; + white-space:nowrap; } .credit{ - text-align:left; - margin:-10px 0; + text-align:left; + margin:-10px 0; } .credit p{ - display:inline-block; - width:275px; - vertical-align:top; - margin:10px 0; + display:inline-block; + width:275px; + vertical-align:top; + margin:10px 0; } .credit span{ - display:block; - color:#aaa; + display:block; + color:#aaa; } .resources{ - text-align:left; + text-align:left; } .resources>div{ - border-top:1px solid #e0e0e0; + border-top:1px solid #e0e0e0; } .resources>div:first-child{ - border-top:0; + border-top:0; } .resources div div{ - display:inline-block; - width:380px; - vertical-align:top; - padding:10px 0 25px 0; - min-height:200px; + display:inline-block; + width:380px; + vertical-align:top; + padding:10px 0 25px 0; + min-height:200px; } .resources>div>div:first-child{ - padding-right:40px; - border-right:1px solid #e0e0e0; + padding-right:40px; + border-right:1px solid #e0e0e0; } .resources>div>div:first-child+div{ - padding-left:40px; - border-left:1px solid #e0e0e0; - margin-left:-1px; + padding-left:40px; + border-left:1px solid #e0e0e0; + margin-left:-1px; } .resources div div div{ - display:block; - width:auto; + display:block; + width:auto; } .resources p{ - font-size:115%; - margin:6px 0; + font-size:115%; + margin:6px 0; } .resourcesorg{ - margin-bottom:40px; - text-align:left; - font-size:0; + margin-bottom:40px; + text-align:left; + font-size:0; } .resourcesorg div{ - border-top:1px solid #e0e0e0; + border-top:1px solid #e0e0e0; } .resourcesorg div:first-child,.resourcesorg div div{ - border-top:0; + border-top:0; } .resourcesorg div div{ - width:278px; - font-size:16px; - display:inline-block; - vertical-align:top; + width:278px; + font-size:16px; + display:inline-block; + vertical-align:top; } .resourcesorg img{ - margin-right:5px; - width:24px; - height:24px; - position:relative; - bottom:-6px; + margin-right:5px; + width:24px; + height:24px; + position:relative; + bottom:-6px; } .exchanges{ - margin-bottom:40px; - text-align:left; - font-size:0; + margin-bottom:40px; + text-align:left; + font-size:0; } .exchanges div{ - border-top:1px solid #e0e0e0; + border-top:1px solid #e0e0e0; } .exchanges div:first-child,.exchanges div div{ - border-top:0; + border-top:0; } .exchanges div div{ - width:278px; - font-size:16px; - display:inline-block; - vertical-align:top; + width:278px; + font-size:16px; + display:inline-block; + vertical-align:top; } .exchanges img{ - margin-right:5px; - width:24px; - height:24px; - position:relative; - bottom:-6px; + margin-right:5px; + width:24px; + height:24px; + position:relative; + bottom:-6px; } .resourcesmore{ - text-align:center; - margin-top:40px; + text-align:center; + margin-top:40px; } .resourcesmore div{ - display:inline-block; - text-align:left; - padding:20px 40px; - border-top:1px solid #e0e0e0; - border-left:1px solid #e0e0e0; - border-right:1px solid #e0e0e0; + display:inline-block; + text-align:left; + padding:20px 40px; + border-top:1px solid #e0e0e0; + border-left:1px solid #e0e0e0; + border-right:1px solid #e0e0e0; } .resourcesmore div h2{ - text-align:center; - margin-bottom:25px; + text-align:center; + margin-bottom:25px; } .resourcesmore div p{ - font-size:115%; - margin:6px 0; + font-size:115%; + margin:6px 0; } .coredevtable div div:first-child{ - width:200px; + width:200px; } .coredevtable div div:first-child+div{ - width:220px; + width:220px; } .coredevtable div div:first-child+div+div{ - width:80px; + width:80px; } .chatbox{ - text-align:center; + text-align:center; } .devprojectlist{ - overflow:hidden; - margin:-10px 0; - -moz-transition:height 400ms ease-out; - -webkit-transition:height 400ms ease-out; - transition:height 400ms ease-out; + overflow:hidden; + margin:-10px 0; + -moz-transition:height 400ms ease-out; + -webkit-transition:height 400ms ease-out; + transition:height 400ms ease-out; } .devprojectlist li{ - margin:10px 0; + margin:10px 0; } .devprojectlist li:nth-child(1n+4){ - display:none; + display:none; } .devprojectlist.expanded li:nth-child(1n+4){ - display:list-item; + display:list-item; } .devprojectlist li.more{ - display:block; + display:block; } .devprojectlist.expanded li.more{ - display:none; + display:none; } .devprojectlist a{ - display:inline-block; - margin-top:5px; -} - -.walletmenu{ - text-align:center; - position:relative; - z-index:90; -} -.walletmenu>ul{ - display:inline-block; - text-align:left; - padding:0 0 25px 0; - border-bottom:1px solid #E2E2E2; - background-color:#fff; -} -.walletmenu>ul li{ - font-family:'Ubuntu', sans-serif; - position:relative; - display:inline-block; - background-repeat:no-repeat; - background-position:left 6px; - padding:0; - margin:15px 10px; - font-size:130%; - font-weight:bold; - -moz-transition:background-color 400ms ease-out; - -webkit-transition:background-color 400ms ease-out; - transition:background-color 400ms ease-out; - -webkit-border-radius:4px; - -moz-border-radius:4px; - border-radius:4px; -} -.walletmenu>ul>li:first-child{ - margin-left:0; -} -.walletmenu>ul>li:last-child{ - margin-right:0; -} -.walletmenu>ul>li a, -.walletmenu>ul>li a:link, -.walletmenu>ul>li a:active, -.walletmenu>ul>li a:visited{ - color:#383838; -} -.walletmenu>ul>li a{ - white-space:nowrap; - cursor:pointer; - display:block; - padding:8px 10px 5px 42px; -} -.walletmenu>ul>li ul{ - display:none; - position:absolute; - background-color:#fff; - border:1px solid #0d579b; - padding:4px 0; - min-width:110%; - left:0; - -moz-box-sizing:border-box; - -webkit-box-sizing:border-box; - box-sizing:border-box; -} -.walletmenu>ul>li>ul li{ - font-size:80%; - display:block; - margin:0; - background-position:left 10px; - -webkit-border-radius:0px; - -moz-border-radius:0px; - border-radius:0px; -} -.walletmenu>ul>li>ul>li a{ - background-image:url(/img/icons/wallet_select.svg); - background-repeat:no-repeat; - background-position:-32px center; - padding:8px 32px 5px 32px; - margin:1px 0; -} -.walletmenu>ul>li>ul>li.active>a{ - background-position:right center; -} -.walletmenu .wallet-mobile{ - background-image:url(/img/icons/wallet_menu_mobile.svg); -} -.walletmenu .wallet-desktop{ - background-image:url(/img/icons/wallet_menu_desktop.svg); -} -.walletmenu .wallet-hardware{ - background-image:url(/img/icons/wallet_menu_hardware.svg); -} -.walletmenu .wallet-web{ - background-image:url(/img/icons/wallet_menu_web.svg); -} -.walletmenu .wallet-blackberry{ - background-image:url(/img/os/wallet_menu_blackberry.svg); -} -.walletmenu .wallet-ios{ - background-image:url(/img/os/wallet_menu_ios.svg); -} -.walletmenu .wallet-android{ - background-image:url(/img/os/wallet_menu_android.svg); -} -.walletmenu .wallet-windows{ - background-image:url(/img/os/wallet_menu_windows.svg); -} -.walletmenu .wallet-windowsphone{ - background-image:url(/img/os/wallet_menu_windowsphone.svg); -} -.walletmenu .wallet-mac{ - background-image:url(/img/os/wallet_menu_mac.svg); -} -.walletmenu .wallet-linux{ - background-image:url(/img/os/wallet_menu_linux.png); -} -.walletmenu>ul li.active, -.walletmenu>ul li:hover{ - background-color:#0d579b; -} -.walletmenu>ul li:hover>a, -.walletmenu>ul li:hover>a:link, -.walletmenu>ul li:hover>a:active, -.walletmenu>ul li:hover>a:visited, -.walletmenu>ul li.active>a, -.walletmenu>ul li.active>a:link, -.walletmenu>ul li.active>a:active, -.walletmenu>ul li.active>a:visited{ - color:#fff; -} -.walletmenu>ul:hover>li:first-child, -.walletmenu>ul:hover>li:first-child+li{ - -webkit-border-bottom-left-radius:0; - -webkit-border-bottom-right-radius:0; - -moz-border-radius-bottomleft:0; - -moz-border-radius-bottomright:0; - border-bottom-left-radius:0; - border-bottom-right-radius:0; -} -.walletmenu>ul>li.active, -.walletmenu>ul>li:hover{ - background-position:left -62px; -} -.walletmenu>ul>li:hover>ul{ - display:block; -} -.walletmenu>ul>li>ul>li.active, -.walletmenu>ul>li>ul>li:hover{ - background-position:left -24px; -} - -.wallets{ - width:705px; - height:250px; - text-align:left; - position:relative; - margin:auto; - padding:60px 0 20px 0; - font-size:0; - opacity:1; - -moz-transition:opacity 400ms ease-out; - -webkit-transition:opacity 400ms ease-out; - transition:opacity 400ms ease-out; -} -.wallets.disabled{ - opacity:0; -} -.wallets>div{ - display:inline-block; - vertical-align:top; - font-size:16px; -} -.wallets>div:nth-child(1n+15){ - display:none; -} -.wallets>div>a{ - color:#2c6fad; - cursor:pointer; - font-size:94%; - text-align:center; - text-decoration:none; - font-weight:bold; - width:72px; - height:110px; - display:inline-block; - vertical-align:top; - position:relative; - margin:0 14px 20px 14px; - white-space:nowrap; - outline:0; - -moz-transition:opacity 400ms ease-out; - -webkit-transition:opacity 400ms ease-out; - transition:opacity 400ms ease-out; -} -.wallets>div>a:hover{ - color:#63a4e1; -} -.wallets>div>a>span{ - display:none; - position:absolute; - z-index:100; - height:32px; - background:url(/img/icons/wallet_bubble.svg) no-repeat center 0; - top:0; - left:0; - right:0; -} -.wallets>div>a>img{ - display:block; - width:72px; - height:72px; - margin:auto; - margin-bottom:5px; -} -.wallets>div>div, -.wallets>div>span{ - opacity:0; - width:0; - height:0; - overflow:hidden; - visibility:hidden; - display:inline-block; - position:absolute; - padding:20px; - top:-382px; - left:-20px; - right:-20px; - -moz-transition:opacity 400ms ease-out; - -webkit-transition:opacity 400ms ease-out; - transition:opacity 400ms ease-out; -} -.wallets>div>span{ - z-index:100; - border:solid 2px #2c6faf; - background-color:#f1f8fb; - -webkit-border-radius:4px; - -moz-border-radius:4px; - border-radius:4px; -} -.wallets>div>div{ - z-index:102; -} -.wallets>div:nth-child(1n+7)>div, -.wallets>div:nth-child(1n+7)>span{ - top:-252px; -} -.wallets>div:nth-child(1n+13)>div, -.wallets>div:nth-child(1n+13)>span{ - top:-92px; -} -.wallets>div>div>h2{ - margin:0; - text-align:left; - display:inline-block; -} -.wallets>div>div>h2:first-child+div{ - display:inline-block; - margin-left:10px; -} -.wallets>div>div>h2:first-child+div>img{ - margin-left:4px; -} -.wallets>div>div>h2:first-child+div+div>a{ - display:inline-block; - text-decoration:none; - margin:10px 0; - padding:4px 8px; - -webkit-border-radius:4px; - -moz-border-radius:4px; - border-radius:4px; -} -.wallets>div>div>h2:first-child+div+div>a:first-child{ - font-weight:bold; - background-color:#2c6fad; - background-image:-o-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image:-moz-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image:-webkit-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image:-ms-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image:linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - border:1px solid #255f96; - margin-right:10px; -} -.wallets>div>div>h2:first-child+div+div>a:first-child, -.wallets>div>div>h2:first-child+div+div>a:first-child:visited, -.wallets>div>div>h2:first-child+div+div>a:first-child:link, -.wallets>div>div>h2:first-child+div+div>a:first-child:active{ - color:#fff; -} -.wallets>div>div>h2:first-child+div+div>a:first-child+a{ - font-weight:normal; - color:#255f96; - border:1px solid #255f96; -} -.wallets>div>div>h2:first-child+div+div>a:first-child+a, -.wallets>div>div>h2:first-child+div+div>a:first-child+a:visited, -.wallets>div>div>h2:first-child+div+div>a:first-child+a:link, -.wallets>div>div>h2:first-child+div+div>a:first-child+a:active{ - color:#255f96; -} -.wallets>div>div>h2:first-child+div+div+div{ - margin:5px 0; -} -.wallets>div>div>h2:first-child+div+div+div>div{ - padding:5px 0 5px 22px; - background-repeat:no-repeat; - background-position:left 4px; - cursor:default; - line-height:16px; -} -.wallets>div>div>h2:first-child+div+div+div>div>div{ - display:inline-block; - background-image:url(/img/icons/wallet_help.png); - background-image:none, url(/img/icons/wallet_help.svg), url(/img/icons/wallet_help.png); - width:16px; - height:16px; - margin-left:5px; - vertical-align:top; - position:relative; -} -.wallets>div>div>h2:first-child+div+div+div>div>div>span{ - display:none; - position:absolute; - left:6px; - top:-30px; - width:25px; - height:70px; - z-index:90; - background-repeat:no-repeat; - background-position:right 30px; -} -.wallets>div>div>h2:first-child+div+div+div>div>div>p, -.wallets>div>div>h2:first-child+div+div+div>div>div>div{ - opacity:0; - width:0; - height:0; - overflow:hidden; - border:1px solid; - visibility:hidden; - position:absolute; - background-color:#fff; - left:30px; - margin:0; - -moz-transition:opacity 400ms ease-out; - -webkit-transition:opacity 400ms ease-out; - transition:opacity 400ms ease-out; - -webkit-border-radius:4px; - -moz-border-radius:4px; - border-radius:4px; - z-index:90; -} -.wallets>div>div>h2:first-child+div+div+div>div>div>p{ - font-size:85%; - padding:10px; - top:-30px; -} -.wallets>div>div>h2:first-child+div+div+div>div>div>div{ - padding:0 10px; - top:-80px; -} -.wallets>div>div>h2:first-child+div+div+div>div>div>div>div>p:first-child+p{ - font-size:85%; -} -.wallets>div>div>h2:first-child+div+div+div+p{ - font-size:95%; - margin:0; - padding-right:5px; - height:137px; - width:320px; - overflow:auto; -} -.wallets>div>div>h2:first-child+div+div+div+p+div{ - position:absolute; - top:20px; - right:20px; - height:400px; - width:250px; -} -.wallets>div>div>h2:first-child+div+div+div+p+div>img{ - border:1px solid #BDBDBD; -} -.wallets .checkgood{ - color:#329239; - font-weight:bold; -} -.wallets .checkgood p{ - border-color:#329239; - font-weight:normal; -} -.wallets .checkgood>div>span{ - background-image:url(/img/icons/checkbubble_pass.svg); -} -.wallets .checkpass{ - color:#329239; -} -.wallets .checkpass p{ - border-color:#329239; -} -.wallets .checkpass>div>span{ - background-image:url(/img/icons/checkbubble_pass.svg); -} -.wallets .checkneutral{ - color:#8b8b8b; -} -.wallets .checkneutral p{ - border-color:#8b8b8b; -} -.wallets .checkneutral>div>span{ - background-image:url(/img/icons/checkbubble_neutral.svg); -} -.wallets .checkfail{ - color:#ee9209; -} -.wallets .checkfail p{ - border-color:#ee9209; -} -.wallets .checkfail>div>span{ - background-image:url(/img/icons/checkbubble_fail.svg); -} -.wallets .checkcontrol.checkpass, -.wallets .checkcontrol.checkgood{ - background-image:url(/img/icons/check_control_pass.svg); -} -.wallets .checkcontrol.checkfail{ - background-image:url(/img/icons/check_control_fail.svg); -} -.wallets .checkvalidation.checkpass, -.wallets .checkvalidation.checkgood{ - background-image:url(/img/icons/check_validation_pass.svg); -} -.wallets .checkvalidation.checkneutral{ - background-image:url(/img/icons/check_validation_neutral.svg); -} -.wallets .checkvalidation.checkfail{ - background-image:url(/img/icons/check_validation_fail.svg); -} -.wallets .checktransparency.checkpass, -.wallets .checktransparency.checkgood{ - background-image:url(/img/icons/check_transparency_pass.svg); -} -.wallets .checktransparency.checkfail{ - background-image:url(/img/icons/check_transparency_fail.svg); -} -.wallets .checkenvironment.checkpass, -.wallets .checkenvironment.checkgood{ - background-image:url(/img/icons/check_environment_pass.svg); -} -.wallets .checkenvironment.checkfail{ - background-image:url(/img/icons/check_environment_fail.svg); -} -.wallets .checkfees.checkpass, -.wallets .checkfees.checkgood{ - background-image:url(/img/icons/check_fees_pass.svg); -} -.wallets .checkfees.checkfail{ - background-image:url(/img/icons/check_fees_fail.svg); -} -.wallets .checkfees.checkneutral{ - background-image:url(/img/icons/check_fees_neutral.svg); -} -.wallets .checkprivacy.checkpass, -.wallets .checkprivacy.checkgood{ - background-image:url(/img/icons/check_privacy_pass.svg); -} -.wallets .checkprivacy.checkneutral{ - background-image:url(/img/icons/check_privacy_neutral.svg); -} -.wallets .checkprivacy.checkfail{ - background-image:url(/img/icons/check_privacy_fail.svg); -} -.wallets>div:hover>a>span, -.wallets>div.active>a>span, -.wallets.nohover>div.active:hover>a>span{ - display:block; -} -.wallets.nohover>div:hover>a>span{ - display:none; -} -.wallets>div:hover>div, -.wallets>div:hover>span, -.wallets>div.active>div, -.wallets>div.active>span, -.wallets.nohover>div.active:hover>div, -.wallets.nohover>div.active:hover>span{ - opacity:1; - width:auto; - height:400px; - visibility:visible; - overflow:visible; -} -.wallets.nohover>div:hover>div, -.wallets.nohover>div:hover>span{ - opacity:0; - width:0; - height:0; - visibility:hidden; -} -.wallets>div>div>h2:first-child+div+div>a:first-child:hover{ - background-image:none; -} -.wallets>div>div>h2:first-child+div+div+div>div:hover>div>span{ - display:block; -} -.wallets>div>div>h2:first-child+div+div+div>div:hover>div>p, -.wallets>div>div>h2:first-child+div+div+div>div:hover>div>div{ - opacity:1; - width:400px; - height:auto; - visibility:visible; -} - -.walletsswitch{ - display:none; -} -.walletsmobile{ - display:none; -} - -.walletsdisclaimer h2{ - text-align:center; + display:inline-block; + margin-top:5px; } h1 .rssicon{ - vertical-align:bottom; - margin-bottom:9px; - margin-left:10px; + vertical-align:bottom; + margin-bottom:9px; + margin-left:10px; } h2 .rssicon{ - vertical-align:bottom; - margin-bottom:7px; - margin-left:10px; + vertical-align:bottom; + margin-bottom:7px; + margin-left:10px; } .versiontext{ - text-align:left; - margin-bottom:40px; - max-width:600px; + text-align:left; + margin-bottom:40px; + max-width:600px; } .versiontext h1{ - text-align:left; + text-align:left; } .alerttitle img{ - display:block; - margin:auto; - width:42px; - height:42px; + display:block; + margin:auto; + width:42px; + height:42px; } .alertstatusinactive{ - font-size:130%; - color:#0d579b; - margin-bottom:30px; + font-size:130%; + color:#0d579b; + margin-bottom:30px; } .alertstatusactive{ - font-size:130%; - color:#d57700; - margin-bottom:30px; + font-size:130%; + color:#d57700; + margin-bottom:30px; } .alertsactive{ - margin-bottom:20px; + margin-bottom:20px; } .alertsactive a{ - font-weight:bold; + font-weight:bold; } .alerticon{ - width:42px; - height:42px; - float:left; - margin-top:12px; - margin-right:12px; + width:42px; + height:42px; + float:left; + margin-top:12px; + margin-right:12px; } .redirectmsg{ - text-align:center; - margin:20px 0; + text-align:center; + margin:20px 0; } .redirectmsg h1{ - color:#7b7c7c; - font-weight:400; - font-size:180%; + color:#7b7c7c; + font-weight:400; + font-size:180%; } .redirectmsg p{ - font-size:150%; + font-size:150%; } .attribution{ - font-size:75% + font-size:75% } .download{ - text-align:center; + text-align:center; } .download p{ - text-align:justify; + text-align:justify; } .download div p{ - text-align:center; + text-align:center; } .download h1, .download h2{ - text-align:center; + text-align:center; } .download .mainbutton a{ - margin:10px 0 35px 0; + margin:10px 0 35px 0; } .downloadbox{ - display:inline-block; - border:2px solid #fad296; - padding:20px; - font-size:125%; - -webkit-border-radius:12px; - -moz-border-radius:12px; - border-radius:12px; - margin:0 auto 20px auto; + display:inline-block; + border:2px solid #fad296; + padding:20px; + font-size:125%; + -webkit-border-radius:12px; + -moz-border-radius:12px; + border-radius:12px; + margin:0 auto 20px auto; } .downloadbox p{ - margin:0; + margin:0; } .downloadbox p.downloadmore a{ - font-size:90%; + font-size:90%; } .downloadbox p.downloadkeys{ - font-size:80%; - margin-top:15px; + font-size:80%; + margin-top:15px; } .downloadbox p.downloadkeys span{ - display:block; + display:block; } .downloadbox p.downloadkeys a{ - display:inline-block; - padding: 5px 10px 0 20px; - background:url(/img/icons/mini_ico_key.svg) left 8px no-repeat; + display:inline-block; + padding: 5px 10px 0 20px; + background:url(/img/icons/mini_ico_key.svg) left 8px no-repeat; } .downloadbox div a{ - display:inline-block; + display:inline-block; } .downloadbox div{ - display:inline-block; - margin:0 10px; - vertical-align:top; + display:inline-block; + margin:0 10px; + vertical-align:top; } .downloadbox div div{ - display:block; - width:190px; - height:46px; - margin:25px 0; - text-align:left; + display:block; + width:190px; + height:46px; + margin:25px 0; + text-align:left; } .downloadbox div div span{ - display:inline-block; - margin-left:6px; + display:inline-block; + margin-left:6px; } .downloadbox div div span span{ - display:block; - margin:6px 0 0 0; - font-size:80%; + display:block; + margin:6px 0 0 0; + font-size:80%; } .downloadbox img{ - width:32px; - height:32px; - vertical-align:top; - position:relative; - top:4px; + width:32px; + height:32px; + vertical-align:top; + position:relative; + top:4px; } .downloadbox .magnetlink{ - display:inline-block; - width:16px; - height:16px; - position:relative; - bottom:-1px; - background:url(/img/icons/mini_ico_magnet.svg) no-repeat; + display:inline-block; + width:16px; + height:16px; + position:relative; + bottom:-1px; + background:url(/img/icons/mini_ico_magnet.svg) no-repeat; } .eventmap{ - height:400px; - margin-bottom:25px; + height:400px; + margin-bottom:25px; } .listtable div{ - padding:8px 0; - border-top:1px solid #E2E2E2; + padding:8px 0; + border-top:1px solid #E2E2E2; } .listtable div:first-child{ - border-top:0; + border-top:0; } .listtable div div{ - display:inline-block; - vertical-align:middle; - text-align:left; - line-height:1.5em; - padding:0; - border-top:0; - padding-right:20px; + display:inline-block; + vertical-align:middle; + text-align:left; + line-height:1.5em; + padding:0; + border-top:0; + padding-right:20px; } .eventtable div div:first-child{ - width:100px; + width:100px; } .eventtable div div:first-child+div{ - width:300px; + width:300px; } .eventtable div div:first-child+div+div{ - width:300px; + width:300px; } .eventtable span a, .eventtable span a:link, .eventtable span a:active, .eventtable span a:visited{ - display:inline-block; - padding:6px 12px; - margin:15px 0 30px 0; - font-size:115%; - color:#fff; - border:1px solid #d57700; - background-color:#ee9209; - background-image:-o-linear-gradient(bottom, #e28700 14%, #ee9209 70%); - background-image:-moz-linear-gradient(bottom, #e28700 14%, #ee9209 70%); - background-image:-webkit-linear-gradient(bottom, #e28700 14%, #ee9209 70%); - background-image:-ms-linear-gradient(bottom, #e28700 14%, #ee9209 70%); - background-image:linear-gradient(bottom, #e28700 14%, #ee9209 70%); - -webkit-border-radius:3px; - -moz-border-radius:3px; - border-radius:3px; + display:inline-block; + padding:6px 12px; + margin:15px 0 30px 0; + font-size:115%; + color:#fff; + border:1px solid #d57700; + background-color:#ee9209; + background-image:-o-linear-gradient(bottom, #e28700 14%, #ee9209 70%); + background-image:-moz-linear-gradient(bottom, #e28700 14%, #ee9209 70%); + background-image:-webkit-linear-gradient(bottom, #e28700 14%, #ee9209 70%); + background-image:-ms-linear-gradient(bottom, #e28700 14%, #ee9209 70%); + background-image:linear-gradient(bottom, #e28700 14%, #ee9209 70%); + -webkit-border-radius:3px; + -moz-border-radius:3px; + border-radius:3px; } .eventtable span a:hover{ - background-image:none; - color:#fff; + background-image:none; + color:#fff; } .eventdata{ - display:none; + display:none; } .detectmobile{ - width:0; - height:0; - display:none; + width:0; + height:0; + display:none; } .summary{ - font-size:125%; - margin-bottom:40px; - text-align:center; + font-size:125%; + margin-bottom:40px; + text-align:center; } .summarytxt{ - margin-bottom:40px; + margin-bottom:40px; } .press h2{ - font-size:150%; + font-size:150%; } .press-volunteer{ - text-align:left; - margin-bottom:40px; + text-align:left; + margin-bottom:40px; } .press-faq{ - text-align:left; - margin-bottom:40px; + text-align:left; + margin-bottom:40px; } .press-faq>div{ - width:380px; - display:inline-block; - vertical-align:top; - margin-bottom:15px; - margin-right:30px; + width:380px; + display:inline-block; + vertical-align:top; + margin-bottom:15px; + margin-right:30px; } .press-faq>div>a{ - display:inline-block; - font-weight:bold; - margin-right:20px; + display:inline-block; + font-weight:bold; + margin-right:20px; } .press-faq>div>div{ - height:0; - overflow:hidden; - -moz-transition:height 400ms ease-out; - -webkit-transition:height 400ms ease-out; - transition:height 400ms ease-out; + height:0; + overflow:hidden; + -moz-transition:height 400ms ease-out; + -webkit-transition:height 400ms ease-out; + transition:height 400ms ease-out; } .press-faq>div>div.expanded{ - height:auto; + height:auto; } .press-faq li{ - line-height:1.5em; + line-height:1.5em; } .press-faq p{ - text-align:left; + text-align:left; } .press-faq div span p{ - margin-bottom:0; + margin-bottom:0; } .press-videos{ - margin-bottom:40px; + margin-bottom:40px; } .press-videos div{ - display:inline-block; - vertical-align:top; - margin-right:10px; + display:inline-block; + vertical-align:top; + margin-right:10px; } .press-videos div a{ - display:inline-block; - margin-right:10px; - margin-bottom:10px; + display:inline-block; + margin-right:10px; + margin-bottom:10px; } .press-videos img{ - width:250px; - height:136px; - -webkit-border-radius:10px; - -moz-border-radius:10px; - border-radius:10px; + width:250px; + height:136px; + -webkit-border-radius:10px; + -moz-border-radius:10px; + border-radius:10px; } .press-pictures{ - text-align:left; - margin-bottom:40px; + text-align:left; + margin-bottom:40px; } .press-pictures div{ - height:270px; - overflow:hidden; - -moz-transition:height 400ms ease-out; - -webkit-transition:height 400ms ease-out; - transition:height 400ms ease-out; + height:270px; + overflow:hidden; + -moz-transition:height 400ms ease-out; + -webkit-transition:height 400ms ease-out; + transition:height 400ms ease-out; } .press-pictures img{ - margin-right:14px; - margin-bottom:14px; - height:120px; - width:120px; - -webkit-border-radius:10px; - -moz-border-radius:10px; - border-radius:10px; + margin-right:14px; + margin-bottom:14px; + height:120px; + width:120px; + -webkit-border-radius:10px; + -moz-border-radius:10px; + border-radius:10px; } .press-pictures>a{ - display:inline-block; - padding-top:10px; - font-weight:bold; + display:inline-block; + padding-top:10px; + font-weight:bold; } .press-quotes{ - margin-bottom:40px; - overflow:hidden; - -moz-transition:height 400ms ease-out; - -webkit-transition:height 400ms ease-out; - transition:height 400ms ease-out; + margin-bottom:40px; + overflow:hidden; + -moz-transition:height 400ms ease-out; + -webkit-transition:height 400ms ease-out; + transition:height 400ms ease-out; } .press-quotes.expanded{ - height:auto; + height:auto; } .press-quotes div{ - position:relative; - left:-20px; - text-align:left; + position:relative; + left:-20px; + text-align:left; } .press-quotes p{ - display:inline-block; - vertical-align:top; - width:380px; - margin:0 0 20px 20px; + display:inline-block; + vertical-align:top; + width:380px; + margin:0 0 20px 20px; padding-left: 20px; } .press-quotes p:nth-child(1n+9){ - display:none; + display:none; } .press-quotes.expanded p:nth-child(1n+9){ - display:inline-block; + display:inline-block; } .press-quotes>a{ - display:inline-block; - padding-top:10px; - font-weight:bold; + display:inline-block; + padding-top:10px; + font-weight:bold; } .press-quotes.expanded>a{ - display:none; + display:none; } .press-quotes span:first-child{ - font-weight:bold; - display:block; - margin-bottom:4px; + font-weight:bold; + display:block; + margin-bottom:4px; } .press-quotes span:first-child:before{ - position:absolute; - margin-left:-16px; - font-weight:bold; - font-size:180%; - content:"“"; + position:absolute; + margin-left:-16px; + font-weight:bold; + font-size:180%; + content:"“"; } .press-quotes span:first-child:after{ - position:absolute; - margin-right:-16px; - font-weight:bold; - font-size:180%; - content:"”"; + position:absolute; + margin-right:-16px; + font-weight:bold; + font-size:180%; + content:"”"; } .press-quotes p.final { - width: 100%; + width: 100%; } /*Styles specific to printing*/ @media print{ - .head{ - display:none; - } - .footer{ - display:none; - } - .content{ - padding:0; - border:0; - } - .toc{ - display:none; - } - .toccontent{ - width:auto; - } - .develdocdisclaimer{ - display:none; - } + .head{ + display:none; + } + .footer{ + display:none; + } + .content{ + padding:0; + border:0; + } + .toc{ + display:none; + } + .toccontent{ + width:auto; + } + .develdocdisclaimer{ + display:none; + } } /*Styles specific to mobiles*/ @media handheld, only screen and ( max-width: 60em ), only screen and ( max-device-width: 60em ){ - img{ - max-width:100%; - } - h1, - h2{ - text-align:center; - } - table{ - display: block; - overflow: scroll; - -webkit-overflow-scrolling: touch; - } - .toccontent .multicode, - .toccontent .multicode pre, - .toccontent pre{ - display: table; /* Triggers a block formating context so the container expands with the content */ - } - .toccontent .multicode, - .toccontent pre{ - padding:10px; - } - .toccontent .multicode pre{ - padding:0; - } - .titleicon, - .warningicon{ - display:block; - position:static; - margin:auto; - margin-bottom:5px; - } - .banner-message a span{ - width:auto; - } - .head{ - margin:0; - } - .head div{ - width:auto; - } - .body{ - width:auto; - } - .langselect{ - text-align:left; - background-color:#fff; - border-top:2px solid #ebebeb; - } - .langselect select{ - text-align:left; - background-color:transparent; - border:0; - font-size:115%; - padding:8px 0; - margin-top:12px; - margin-left:10px; - width:95%; - -webkit-appearance:none; - -moz-appearance:none; - } - .menumobile{ - cursor:pointer; - display:inline-block; - float:right; - height:40px; - width:40px; - padding:12px; - background-image:url(/img/icons/menumobile.svg); - background-repeat:no-repeat; - background-position:center center; - } - .lang, - .menusimple{ - display:none; - background-color:#fff; - position:static; - bottom:0; - margin:0; - height:auto; - overflow:auto; - -webkit-tap-highlight-color:rgba(0,0,0,0); - -webkit-tap-highlight-color:transparent; - } - .menusimple>li a, - .menusimple>li>ul>li a{ - padding:10px 6px 8px 6px; - display:block; - } - .menusimple li{ - display:block; - margin:4px; - position:static; - } - .menusimple>li ul{ - min-width:0; - position:relative; - } - .menusimple.menutap li:hover{ - background-color:#fff; - } - .menusimple.menutap li:hover>a{ - color:#2c6fad; - } - .menusimple.menutap li:hover>ul{ - display:none; - } - .menusimple.menutap li.hover, - .menusimple.menutap li.active{ - background-color:#2c6fad; - } - .menusimple.menutap li.hover>a, - .menusimple.menutap li.active>a{ - color:#fff; - } - .menusimple.menutap li.hover>ul, - .menusimple.menutap li.active>ul{ - display:block; - } - .logo{ - position:static; - display:inline-block; - margin:10px; - } - .content{ - position:static; - text-align:left; - margin:0; - padding:20px 10px; - border-right:0; - border-left:0; - -webkit-border-radius:0; - -moz-border-radius:0; - border-radius:0; - } - .footer{ - line-height:1.5em; - width:auto; - } - .index{ - padding:15px; - } - .index ul{ - padding:5px 0; - } - .index li{ - padding:3px 0; - } - .docreference a{ - display:block; - margin:0 auto 40px auto; - } - .glossary_term { - width: 80%; - } - .toc{ - position:static; - margin-top:0px; - padding:10px; - border:2px dashed #4892b2; - display:inline-block; - } - .toc div{ - width:auto; - } - .toc div.scroll{ - position:static; - } - .toc ul, - .toc.scroll ul{ - width:auto; - padding:0; - border:0; - } - .toc ul li ul{ - display:block; - } - .toc ul li ul li ul li{ - padding-left:0; - } - .toc ul li a{ - padding:0; - } - .toc ul li ul li a:hover:before, - .toc ul li ul li a.active:before{ - content:""; - } - .toc ul.goback li, - .toc ul.reportissue li, - .toc ul.editsource li{ - background:none; - } - .toccontent{ - width:auto; - } - .toccontent a.auto-link:link, - .toccontent a.auto-link:visited{ - color:#2c6fad; - } - .develdocdisclaimer{ - padding:15px; - width:auto; - } - .contributors{ - width:auto; - } - .tablehalf{ - position:static; - width:auto; - } - .tablehalf div{ - display:block; - width:auto; - margin-left:0; - } - .tablehalf img{ - width:auto; - height:auto; - margin:auto; - display:block; - } - .listtable div div{ - display:block; - } - .eventtable div div:first-child, - .eventtable div div:first-child+div, - .eventtable div div:first-child+div+div{ - width:auto; - } - .coredevtable div div:first-child, - .coredevtable div div:first-child+div, - .coredevtable div div:first-child+div+div{ - width:auto; - } - .press-faq>div{ - width:auto; - display:block; - margin-right:0; - } - .press-quotes p{ - width:auto; - } - .mainvideo>div{ - position:relative; - padding-bottom:56.25%; - height:0; - overflow:hidden; - } - .mainvideo iframe{ - position:absolute; - top:0; - left:0; - width:100%; - height:100%; - } - .mainvideo img{ - height:auto; - } - .start>div{ - position:static; - } - .start>div:first-child+div{ - border-top:0; - } - .start div div{ - display:block; - width:auto; - padding:0 0 50px 0; - position:relative; - } - .start>div>div:first-child{ - border-right:0; - padding-right:0; - } - .start div div div{ - position:static; - text-align:center; - bottom:15px; - } - .start>div>div:first-child+div{ - border-left:0; - padding-left:0; - margin-left:0; - } - .resources>div{ - border-top:0; - } - .resources div div{ - display:block; - width:auto; - padding:0 0 10px 0; - min-height:0; - } - .resources>div>div:first-child{ - padding-right:0; - border-right:0; - } - .resources>div>div:first-child+div{ - border-left:0; - padding-left:0; - margin-left:0; - } - .resources, - .resources p{ - text-align:center; - } - .resourcesorg div div{ - width:auto; - display:block; - } - .resourcesorg div{ - border-top:0; - } - .resourcesmore{ - margin-top:0; - } - .resourcesmore div{ - padding:0; - border:0; - } - .walletmenu{ - -webkit-tap-highlight-color:rgba(0,0,0,0); - -webkit-tap-highlight-color:transparent; - } - .walletmenu>ul{ - display:block; - } - .walletmenu>ul li{ - display:block; - margin:15px 0; - } - .walletmenu>ul>li ul{ - position:relative; - min-width:0; - } - .walletmenu>ul.menutap li:hover{ - background-color:#fff; - } - .walletmenu>ul.menutap li:hover>a, - .walletmenu>ul.menutap li:hover>a:link, - .walletmenu>ul.menutap li:hover>a:active, - .walletmenu>ul.menutap li:hover>a:visited{ - color:#383838; - } - .walletmenu>ul.menutap>li:hover{ - background-position:left 6px; - } - .walletmenu>ul.menutap>li:hover>ul{ - display:none; - } - .walletmenu>ul.menutap>li>ul>li:hover{ - background-position:left 10px; - } - .walletmenu>ul.menutap li.active{ - background-color:#0d579b; - } - .walletmenu>ul.menutap li.active>a, - .walletmenu>ul.menutap li.active>a:link, - .walletmenu>ul.menutap li.active>a:active, - .walletmenu>ul.menutap li.active>a:visited{ - color:#fff; - } - .walletmenu>ul.menutap>li.active{ - background-position:left -62px; - } - .walletmenu>ul.menutap>li.active>ul{ - display:block; - } - .walletmenu>ul.menutap>li>ul>li.active{ - background-position:left -24px; - } - .wallets{ - width:auto; - height:auto; - -webkit-tap-highlight-color:rgba(0,0,0,0); - -webkit-tap-highlight-color:transparent; - } - .wallets>div:hover>span{ - display:none; - } - .wallets>div>div{ - border:solid 2px #2c6faf; - background-color:#f1f8fb; - -moz-transition:opacity 400ms ease-out; - -webkit-transition:opacity 400ms ease-out; - transition:opacity 400ms ease-out; - -webkit-border-radius:4px; - -moz-border-radius:4px; - border-radius:4px; - } - .wallets>div:hover>div{ - opacity:0; - width:0; - height:0; - visibility:hidden; - } - .wallets>div>a, - .wallets>div>a:visited, - .wallets>div>a:link, - .wallets>div>a:active{ - margin:0 13px 20px 13px; - } - .wallets>div:hover>a>span{ - display:none; - } - .wallets.walletsmobile{ - display:block; - padding:10px 0; - } - .wallets.walletsmobile>div>a{ - display:none; - } - .wallets.walletsmobile>div>div, - .wallets.walletsmobile>div:hover>div{ - display:block; - position:relative; - top:0; - left:0; - right:0; - padding:10px; - opacity:1; - width:auto; - height:auto; - visibility:visible; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div{ - padding:8px 0 8px 22px; - background-position:left 7px; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div+p{ - padding-right:5px; - height:auto; - width:auto; - overflow:visible; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div+p+div{ - position:static; - height:auto; - width:auto; - margin-top:10px; - padding:0; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div.hover>div{ - display:block; - background:none; - width:auto; - height:auto; - margin-left:0; - margin-top:10px; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div>div>p, - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div>div>div, - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div>div>span{ - display:none; - position:relative; - width:auto; - height:auto; - visibility:visible; - opacity:1; - border:0; - background:none; - padding:0; - top:0; - left:-20px; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div.hover>div>p, - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div.hover>div>div{ - display:block; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div.hover>div>span{ - display:none; - } - .download{ - text-align:left; - } - .download p{ - text-align:left; - } - .download div p{ - text-align:left; - } - .download .mainbutton{ - display:none; - } - .downloadbox{ - border:0; - padding:0; - text-align:left; - } - .downloadbox div div{ - margin:15px 0; - width:auto; - } - .downloadbox div{ - margin:0; - display:block; - } - .downloadbox>p:first-child{ - display:none; - } - .downloadbox>p+div+div+p{ - margin-top:25px; - } - .eventmap{ - height:200px; - } - .detectmobile{ - display:block; - } + img{ + max-width:100%; + } + h1, + h2{ + text-align:center; + } + table{ + display: block; + overflow: scroll; + -webkit-overflow-scrolling: touch; + } + .toccontent .multicode, + .toccontent .multicode pre, + .toccontent pre{ + display: table; /* Triggers a block formating context so the container expands with the content */ + } + .toccontent .multicode, + .toccontent pre{ + padding:10px; + } + .toccontent .multicode pre{ + padding:0; + } + .titleicon, + .warningicon{ + display:block; + position:static; + margin:auto; + margin-bottom:5px; + } + .banner-message a span{ + width:auto; + } + .head{ + margin:0; + } + .head div{ + width:auto; + } + .body{ + width:auto; + } + .langselect{ + text-align:left; + background-color:#fff; + border-top:2px solid #ebebeb; + } + .langselect select{ + text-align:left; + background-color:transparent; + border:0; + font-size:115%; + padding:8px 0; + margin-top:12px; + margin-left:10px; + width:95%; + -webkit-appearance:none; + -moz-appearance:none; + } + .menumobile{ + cursor:pointer; + display:inline-block; + float:right; + height:40px; + width:40px; + padding:12px; + background-image:url(/img/icons/menumobile.svg); + background-repeat:no-repeat; + background-position:center center; + } + .lang, + .menusimple{ + display:none; + background-color:#fff; + position:static; + bottom:0; + margin:0; + height:auto; + overflow:auto; + -webkit-tap-highlight-color:rgba(0,0,0,0); + -webkit-tap-highlight-color:transparent; + } + .menusimple>li a, + .menusimple>li>ul>li a{ + padding:10px 6px 8px 6px; + display:block; + } + .menusimple li{ + display:block; + margin:4px; + position:static; + } + .menusimple>li ul{ + min-width:0; + position:relative; + } + .menusimple.menutap li:hover{ + background-color:#fff; + } + .menusimple.menutap li:hover>a{ + color:#2c6fad; + } + .menusimple.menutap li:hover>ul{ + display:none; + } + .menusimple.menutap li.hover, + .menusimple.menutap li.active{ + background-color:#2c6fad; + } + .menusimple.menutap li.hover>a, + .menusimple.menutap li.active>a{ + color:#fff; + } + .menusimple.menutap li.hover>ul, + .menusimple.menutap li.active>ul{ + display:block; + } + .logo{ + position:static; + display:inline-block; + margin:10px; + } + .content{ + position:static; + text-align:left; + margin:0; + padding:20px 10px; + border-right:0; + border-left:0; + -webkit-border-radius:0; + -moz-border-radius:0; + border-radius:0; + } + .footer{ + line-height:1.5em; + width:auto; + } + .index{ + padding:15px; + } + .index ul{ + padding:5px 0; + } + .index li{ + padding:3px 0; + } + .docreference a{ + display:block; + margin:0 auto 40px auto; + } + .glossary_term { + width: 80%; + } + .toc{ + position:static; + margin-top:0px; + padding:10px; + border:2px dashed #4892b2; + display:inline-block; + } + .toc div{ + width:auto; + } + .toc div.scroll{ + position:static; + } + .toc ul, + .toc.scroll ul{ + width:auto; + padding:0; + border:0; + } + .toc ul li ul{ + display:block; + } + .toc ul li ul li ul li{ + padding-left:0; + } + .toc ul li a{ + padding:0; + } + .toc ul li ul li a:hover:before, + .toc ul li ul li a.active:before{ + content:""; + } + .toc ul.goback li, + .toc ul.reportissue li, + .toc ul.editsource li{ + background:none; + } + .toccontent{ + width:auto; + } + .toccontent a.auto-link:link, + .toccontent a.auto-link:visited{ + color:#2c6fad; + } + .develdocdisclaimer{ + padding:15px; + width:auto; + } + .contributors{ + width:auto; + } + .tablehalf{ + position:static; + width:auto; + } + .tablehalf div{ + display:block; + width:auto; + margin-left:0; + } + .tablehalf img{ + width:auto; + height:auto; + margin:auto; + display:block; + } + .listtable div div{ + display:block; + } + .eventtable div div:first-child, + .eventtable div div:first-child+div, + .eventtable div div:first-child+div+div{ + width:auto; + } + .coredevtable div div:first-child, + .coredevtable div div:first-child+div, + .coredevtable div div:first-child+div+div{ + width:auto; + } + .press-faq>div{ + width:auto; + display:block; + margin-right:0; + } + .press-quotes p{ + width:auto; + } + .mainvideo>div{ + position:relative; + padding-bottom:56.25%; + height:0; + overflow:hidden; + } + .mainvideo iframe{ + position:absolute; + top:0; + left:0; + width:100%; + height:100%; + } + .mainvideo img{ + height:auto; + } + .start>div{ + position:static; + } + .start>div:first-child+div{ + border-top:0; + } + .start div div{ + display:block; + width:auto; + padding:0 0 50px 0; + position:relative; + } + .start>div>div:first-child{ + border-right:0; + padding-right:0; + } + .start div div div{ + position:static; + text-align:center; + bottom:15px; + } + .start>div>div:first-child+div{ + border-left:0; + padding-left:0; + margin-left:0; + } + .resources>div{ + border-top:0; + } + .resources div div{ + display:block; + width:auto; + padding:0 0 10px 0; + min-height:0; + } + .resources>div>div:first-child{ + padding-right:0; + border-right:0; + } + .resources>div>div:first-child+div{ + border-left:0; + padding-left:0; + margin-left:0; + } + .resources, + .resources p{ + text-align:center; + } + .resourcesorg div div{ + width:auto; + display:block; + } + .resourcesorg div{ + border-top:0; + } + .resourcesmore{ + margin-top:0; + } + .resourcesmore div{ + padding:0; + border:0; + } + .walletmenu{ + -webkit-tap-highlight-color:rgba(0,0,0,0); + -webkit-tap-highlight-color:transparent; + } + .walletmenu>ul{ + display:block; + } + .walletmenu>ul li{ + display:block; + margin:15px 0; + } + .walletmenu>ul>li ul{ + position:relative; + min-width:0; + } + .walletmenu>ul.menutap li:hover{ + background-color:#fff; + } + .walletmenu>ul.menutap li:hover>a, + .walletmenu>ul.menutap li:hover>a:link, + .walletmenu>ul.menutap li:hover>a:active, + .walletmenu>ul.menutap li:hover>a:visited{ + color:#383838; + } + .walletmenu>ul.menutap>li:hover{ + background-position:left 6px; + } + .walletmenu>ul.menutap>li:hover>ul{ + display:none; + } + .walletmenu>ul.menutap>li>ul>li:hover{ + background-position:left 10px; + } + .walletmenu>ul.menutap li.active{ + background-color:#0d579b; + } + .walletmenu>ul.menutap li.active>a, + .walletmenu>ul.menutap li.active>a:link, + .walletmenu>ul.menutap li.active>a:active, + .walletmenu>ul.menutap li.active>a:visited{ + color:#fff; + } + .walletmenu>ul.menutap>li.active{ + background-position:left -62px; + } + .walletmenu>ul.menutap>li.active>ul{ + display:block; + } + .walletmenu>ul.menutap>li>ul>li.active{ + background-position:left -24px; + } + .wallets{ + width:auto; + height:auto; + -webkit-tap-highlight-color:rgba(0,0,0,0); + -webkit-tap-highlight-color:transparent; + } + .wallets>div:hover>span{ + display:none; + } + .wallets>div>div{ + border:solid 2px #2c6faf; + background-color:#f1f8fb; + -moz-transition:opacity 400ms ease-out; + -webkit-transition:opacity 400ms ease-out; + transition:opacity 400ms ease-out; + -webkit-border-radius:4px; + -moz-border-radius:4px; + border-radius:4px; + } + .wallets>div:hover>div{ + opacity:0; + width:0; + height:0; + visibility:hidden; + } + .wallets>div>a, + .wallets>div>a:visited, + .wallets>div>a:link, + .wallets>div>a:active{ + margin:0 13px 20px 13px; + } + .wallets>div:hover>a>span{ + display:none; + } + .wallets.walletsmobile{ + display:block; + padding:10px 0; + } + .wallets.walletsmobile>div>a{ + display:none; + } + .wallets.walletsmobile>div>div, + .wallets.walletsmobile>div:hover>div{ + display:block; + position:relative; + top:0; + left:0; + right:0; + padding:10px; + opacity:1; + width:auto; + height:auto; + visibility:visible; + } + .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div{ + padding:8px 0 8px 22px; + background-position:left 7px; + } + .wallets.walletsmobile>div>div>h2:first-child+div+div+div+p{ + padding-right:5px; + height:auto; + width:auto; + overflow:visible; + } + .wallets.walletsmobile>div>div>h2:first-child+div+div+div+p+div{ + position:static; + height:auto; + width:auto; + margin-top:10px; + padding:0; + } + .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div.hover>div{ + display:block; + background:none; + width:auto; + height:auto; + margin-left:0; + margin-top:10px; + } + .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div>div>p, + .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div>div>div, + .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div>div>span{ + display:none; + position:relative; + width:auto; + height:auto; + visibility:visible; + opacity:1; + border:0; + background:none; + padding:0; + top:0; + left:-20px; + } + .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div.hover>div>p, + .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div.hover>div>div{ + display:block; + } + .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div.hover>div>span{ + display:none; + } + .download{ + text-align:left; + } + .download p{ + text-align:left; + } + .download div p{ + text-align:left; + } + .download .mainbutton{ + display:none; + } + .downloadbox{ + border:0; + padding:0; + text-align:left; + } + .downloadbox div div{ + margin:15px 0; + width:auto; + } + .downloadbox div{ + margin:0; + display:block; + } + .downloadbox>p:first-child{ + display:none; + } + .downloadbox>p+div+div+p{ + margin-top:25px; + } + .eventmap{ + height:200px; + } + .detectmobile{ + display:block; + } } @media handheld, only screen and ( max-width: 40em ), only screen and ( max-device-width: 40em ){ - .mainlist, - .mainlist>div{ - width:auto; - display:block; - } - .mainlist>div{ - margin:15px auto; - } + .mainlist, + .mainlist>div{ + width:auto; + display:block; + } + .mainlist>div{ + margin:15px auto; + } } + +@import 'wallets'; From e4f95c4554556e268a9fcae40a54ec82cbc2ffd8 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Mon, 17 Jul 2017 15:34:20 +0200 Subject: [PATCH 09/37] Added platforms collection files content --- _platforms/desktop/linux.html | 12 ++++++++++++ _platforms/desktop/mac.html | 11 +++++++++++ _platforms/desktop/windows.html | 11 +++++++++++ _platforms/hardware.html | 10 ++++++++++ .../mobile/{windows-phone.html => windowsphone.html} | 0 _platforms/web.html | 10 ++++++++++ 6 files changed, 54 insertions(+) rename _platforms/mobile/{windows-phone.html => windowsphone.html} (100%) diff --git a/_platforms/desktop/linux.html b/_platforms/desktop/linux.html index e69de29b..f36b7856 100644 --- a/_platforms/desktop/linux.html +++ b/_platforms/desktop/linux.html @@ -0,0 +1,12 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base +id: wallets-desktop-linux +platform: desktop +os: linux +--- + +{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} + diff --git a/_platforms/desktop/mac.html b/_platforms/desktop/mac.html index e69de29b..2d6eac79 100644 --- a/_platforms/desktop/mac.html +++ b/_platforms/desktop/mac.html @@ -0,0 +1,11 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base +id: wallets-desktop-mac +platform: desktop +os: mac +--- + +{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/desktop/windows.html b/_platforms/desktop/windows.html index e69de29b..3fa1cfd2 100644 --- a/_platforms/desktop/windows.html +++ b/_platforms/desktop/windows.html @@ -0,0 +1,11 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base +id: wallets-desktop-windows +platform: desktop +os: windows +--- + +{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/hardware.html b/_platforms/hardware.html index e69de29b..9b5639e6 100644 --- a/_platforms/hardware.html +++ b/_platforms/hardware.html @@ -0,0 +1,10 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base +id: wallets-hardware +platform: hardware +--- + +{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/mobile/windows-phone.html b/_platforms/mobile/windowsphone.html similarity index 100% rename from _platforms/mobile/windows-phone.html rename to _platforms/mobile/windowsphone.html diff --git a/_platforms/web.html b/_platforms/web.html index e69de29b..a34b90f5 100644 --- a/_platforms/web.html +++ b/_platforms/web.html @@ -0,0 +1,10 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base +id: wallets-web +platform: web +--- + +{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} From acedfb821be033d46dcd30484d6e7133e3cee1fa Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Mon, 17 Jul 2017 15:58:58 +0200 Subject: [PATCH 10/37] WIP: Refactoring wallets styles --- _sass/_wallets-menu.scss | 157 +++++++++++++++++++++++++++++++++++++++ _sass/_wallets.scss | 157 --------------------------------------- _sass/screen.scss | 1 + 3 files changed, 158 insertions(+), 157 deletions(-) create mode 100644 _sass/_wallets-menu.scss diff --git a/_sass/_wallets-menu.scss b/_sass/_wallets-menu.scss new file mode 100644 index 00000000..ea825b9d --- /dev/null +++ b/_sass/_wallets-menu.scss @@ -0,0 +1,157 @@ +$platforms: + mobile, + desktop, + hardware, + web; + +$oses: + ios, + android, + windowsphone, + blackberry, + linux, + mac, + windows; + +// Wallet menu +.walletmenu { + text-align: center; + position: relative; + z-index: 90; + + > ul { + display: inline-block; + text-align: left; + padding: 0 0 25px 0; + border-bottom: 1px solid #E2E2E2; + background-color: #fff; + + // Disable border radius of menu buttons + // TODO: rework, so it doesn't rely on the order of submenus + &:hover > li:first-child, + &:hover > li:first-child + li { + -webkit-border-bottom-left-radius: 0; + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-bottomleft: 0; + -moz-border-radius-bottomright: 0; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + } + + > li.active, + > li:hover { + background-position: left -62px; + } + > li:hover > ul { + display: block; + } + > li > ul > li.active, + > li > ul > li:hover { + background-position: left -24px; + } + + li { + font-family: 'Ubuntu', sans-serif; + position: relative; + display: inline-block; + background-repeat: no-repeat; + background-position: left 6px; + padding: 0; + margin: 15px 10px; + font-size: 130%; + font-weight: bold; + -moz-transition: background-color 400ms ease-out; + -webkit-transition: background-color 400ms ease-out; + transition: background-color 400ms ease-out; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + + &:first-child { + margin-left: 0; + } + + &:last-child { + margin-right: 0; + } + + a, + a:link, + a:active, + a:visited { + color: #383838; + } + a { + white-space: nowrap; + cursor: pointer; + display: block; + padding: 8px 10px 5px 42px; + } + + ul { + display: none; + position: absolute; + background-color: #fff; + border: 1px solid #0d579b; + padding: 4px 0; + min-width: 110%; + left: 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + + li { + font-size: 80%; + display: block; + margin: 0; + background-position: left 10px; + -webkit-border-radius: 0px; + -moz-border-radius: 0px; + border-radius: 0px; + + > a { + background-image: url(/img/icons/wallet_select.svg); + background-repeat: no-repeat; + background-position: -32px center; + padding: 8px 32px 5px 32px; + margin: 1px 0; + } + + &.active > a { + background-position: right center; + } + } + } + + &.active, + &:hover { + background-color: #0d579b; + } + + &:hover > a, + &:hover > a:link, + &:hover > a:active, + &:hover > a:visited, + &.active > a, + &.active > a:link, + &.active > a:active, + &.active > a:visited { + color: #fff; + } + } + } + + // Generating icon classes for platforms + @each $platform in $platforms { + .wallet-#{$platform} { + background-image: url('/img/icons/wallet_menu_#{$platform}.svg'); + } + } + + // Generating icon classes for OSes + @each $os in $oses { + .wallet-#{$os} { + background-image: url('/img/os/wallet_menu_#{$os}.svg'); + } + } +} diff --git a/_sass/_wallets.scss b/_sass/_wallets.scss index f3d7e7ba..17812eeb 100644 --- a/_sass/_wallets.scss +++ b/_sass/_wallets.scss @@ -1,160 +1,3 @@ -$platforms: - mobile, - desktop, - hardware, - web; - -$oses: - ios, - android, - windowsphone, - blackberry, - linux, - mac, - windows; - -// Wallet menu -.walletmenu { - text-align: center; - position: relative; - z-index: 90; - - > ul { - display: inline-block; - text-align: left; - padding: 0 0 25px 0; - border-bottom: 1px solid #E2E2E2; - background-color: #fff; - - // Disable border radius of menu buttons - // TODO: rework, so it doesn't rely on the order of submenus - &:hover > li:first-child, - &:hover > li:first-child + li { - -webkit-border-bottom-left-radius: 0; - -webkit-border-bottom-right-radius: 0; - -moz-border-radius-bottomleft: 0; - -moz-border-radius-bottomright: 0; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - } - - li { - font-family: 'Ubuntu', sans-serif; - position: relative; - display: inline-block; - background-repeat: no-repeat; - background-position: left 6px; - padding: 0; - margin: 15px 10px; - font-size: 130%; - font-weight: bold; - -moz-transition: background-color 400ms ease-out; - -webkit-transition: background-color 400ms ease-out; - transition: background-color 400ms ease-out; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - - &:first-child { - margin-left: 0; - } - - &:last-child { - margin-right: 0; - } - - a, - a:link, - a:active, - a:visited { - color: #383838; - } - a { - white-space: nowrap; - cursor: pointer; - display: block; - padding: 8px 10px 5px 42px; - } - - ul { - display: none; - position: absolute; - background-color: #fff; - border: 1px solid #0d579b; - padding: 4px 0; - min-width: 110%; - left: 0; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - - li { - font-size: 80%; - display: block; - margin: 0; - background-position: left 10px; - -webkit-border-radius: 0px; - -moz-border-radius: 0px; - border-radius: 0px; - - > a { - background-image: url(/img/icons/wallet_select.svg); - background-repeat: no-repeat; - background-position: -32px center; - padding: 8px 32px 5px 32px; - margin: 1px 0; - } - - &.active > a { - background-position: right center; - } - } - } - - &.active, - &:hover { - background-color: #0d579b; - } - - &:hover > a, - &:hover > a:link, - &:hover > a:active, - &:hover > a:visited, - &.active > a, - &.active > a:link, - &.active > a:active, - &.active > a:visited { - color: #fff; - } - } - } - - // Generating icon classes for platforms - @each $platform in $platforms { - .wallet-#{$platform} { - background-image: url('/img/icons/wallet_menu_#{$platform}.svg'); - } - } - - // Generating icon classes for OSes - @each $os in $oses { - .wallet-#{$os} { - background-image: url('/img/os/wallet_menu_#{$os}.svg'); - } - } -} -.walletmenu > ul > li.active, -.walletmenu > ul > li:hover { - background-position: left -62px; -} -.walletmenu > ul > li:hover > ul { - display: block; -} -.walletmenu > ul > li > ul > li.active, -.walletmenu > ul > li > ul > li:hover { - background-position: left -24px; -} - .wallets { width: 705px; height: 250px; diff --git a/_sass/screen.scss b/_sass/screen.scss index 5619e7fb..aa92ebf7 100644 --- a/_sass/screen.scss +++ b/_sass/screen.scss @@ -2471,3 +2471,4 @@ h2 .rssicon{ } @import 'wallets'; +@import 'wallets-menu'; From 65d67cd0c18fe467fe85b7e12d8adc7d87e51a99 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Mon, 17 Jul 2017 22:20:33 +0200 Subject: [PATCH 11/37] Removes trailing spaces from _config.yml. Adds wallets collection output. --- _config.yml | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/_config.yml b/_config.yml index 37ee604b..0e43bfa6 100644 --- a/_config.yml +++ b/_config.yml @@ -254,13 +254,13 @@ devsearches: ## RPCs currently documented on Bitcoin.org. CamelCase names (with ## leading capital) for easier quick scanning "RPCs": - - 'AbandonTransaction': "/en/developer-reference#abandontransaction" + - 'AbandonTransaction': "/en/developer-reference#abandontransaction" - 'AddMultiSigAddress': "/en/developer-reference#addmultisigaddress" - 'AddNode': "/en/developer-reference#addnode" - 'AddWitnessAddress': "/en/developer-reference#addwitnessaddress" - 'BackupWallet': "/en/developer-reference#backupwallet" - - 'BumpFee': "/en/developer-reference#bumpfee" - - 'ClearBanned': "/en/developer-reference#clearbanned" + - 'BumpFee': "/en/developer-reference#bumpfee" + - 'ClearBanned': "/en/developer-reference#clearbanned" - 'CreateMultisig': "/en/developer-reference#createmultisig" - 'CreateRawTransaction': "/en/developer-reference#createrawtransaction" - 'DecodeRawTransaction': "/en/developer-reference#decoderawtransaction" @@ -273,7 +273,7 @@ devsearches: - 'EstimatePriority': "/en/developer-reference#estimatepriority" - 'FundRawTransaction': "/en/developer-reference#fundrawtransaction" - 'Generate': "/en/developer-reference#generate" - - 'GenerateToAddress': "/en/developer-reference#generatetoaddress" + - 'GenerateToAddress': "/en/developer-reference#generatetoaddress" - 'GetAccount': "/en/developer-reference#getaccount" - 'GetAccountAddress': "/en/developer-reference#getaccountaddress" - 'GetAddedNodeInfo': "/en/developer-reference#getaddednodeinfo" @@ -284,7 +284,7 @@ devsearches: - 'GetBlockChainInfo': "/en/developer-reference#getblockchaininfo" - 'GetBlockCount': "/en/developer-reference#getblockcount" - 'GetBlockHash': "/en/developer-reference#getblockhash" - - 'GetBlockHeader': "/en/developer-reference#getblockheader" + - 'GetBlockHeader': "/en/developer-reference#getblockheader" - 'GetBlockTemplate': "/en/developer-reference#getblocktemplate" - 'GetChainTips': "/en/developer-reference#getchaintips" - 'GetConnectionCount': "/en/developer-reference#getconnectioncount" @@ -316,7 +316,7 @@ devsearches: - 'GetWalletInfo': "/en/developer-reference#getwalletinfo" - 'GetWork': "/en/developer-reference#getwork" - 'Help': "/en/developer-reference#help" - - 'ImportAddress': "/en/developer-reference#importaddress" + - 'ImportAddress': "/en/developer-reference#importaddress" - 'ImportMulti': "/en/developer-reference#importmulti" - 'ImportPrivkey': "/en/developer-reference#importprivkey" - 'ImportPrunedFunds': "/en/developer-reference#importprunedfunds" @@ -324,7 +324,7 @@ devsearches: - 'KeypoolRefill': "/en/developer-reference#keypoolrefill" - 'ListAccounts': "/en/developer-reference#listaccounts" - 'ListAddressGroupings': "/en/developer-reference#listaddressgroupings" - - 'ListBanned': "/en/developer-reference#listbanned" + - 'ListBanned': "/en/developer-reference#listbanned" - 'ListLockUnspent': "/en/developer-reference#listlockunspent" - 'ListReceivedByAccount': "/en/developer-reference#listreceivedbyaccount" - 'ListReceivedByAddress': "/en/developer-reference#listreceivedbyaddress" @@ -334,9 +334,9 @@ devsearches: - 'LockUnspent': "/en/developer-reference#lockunspent" - 'Move': "/en/developer-reference#move" - 'Ping': "/en/developer-reference#ping-rpc" - - 'PreciousBlock': "/en/developer-reference#preciousblock" - - 'PrioritiseTransaction': "/en/developer-reference#prioritisetransaction" - - 'PruneBlockChain': "/en/developer-reference#pruneblockchain" + - 'PreciousBlock': "/en/developer-reference#preciousblock" + - 'PrioritiseTransaction': "/en/developer-reference#prioritisetransaction" + - 'PruneBlockChain': "/en/developer-reference#pruneblockchain" - 'RemovePrunedFunds': "/en/developer-reference#removeprunedfunds" - 'SendFrom': "/en/developer-reference#sendfrom" - 'SendMany': "/en/developer-reference#sendmany" @@ -348,7 +348,7 @@ devsearches: - 'SetNetworkActive': "/en/developer-reference#setnetworkactive" - 'SetTxFee': "/en/developer-reference#settxfee" - 'SignMessage': "/en/developer-reference#signmessage" - - 'SignMessageWithPrivKey': "/en/developer-reference#signmessagewithprivkey" + - 'SignMessageWithPrivKey': "/en/developer-reference#signmessagewithprivkey" - 'SignRawTransaction': "/en/developer-reference#signrawtransaction" - 'Stop': "/en/developer-reference#stop" - 'SubmitBlock': "/en/developer-reference#submitblock" @@ -364,12 +364,12 @@ devsearches: ## leading capital) for easier quick scanning "REST": - 'GetBlock': "/en/developer-reference#get-block" - - 'GetBlock-noTxDetails': "/en/developer-reference#get-blocknotxdetails" + - 'GetBlock-noTxDetails': "/en/developer-reference#get-blocknotxdetails" - 'GetChainInfo': "/en/developer-reference#get-chaininfo" - 'GetUtxos': "/en/developer-reference#get-getutxos" - 'GetHeaders': "/en/developer-reference#get-headers" - 'GetMemPool-contents': "/en/developer-reference#get-mempoolcontents" - - 'GetMemPool-info': "/en/developer-reference#get-mempoolinfo" + - 'GetMemPool-info': "/en/developer-reference#get-mempoolinfo" ## Opcodes currently implemented in Bitcoin Core master branch. After ## we document them on Bitcoin.org, these links will be updated @@ -477,7 +477,7 @@ devsearches: - "OP_CHECKMULTISIGVERIFY": "https://en.bitcoin.it/wiki/Script#Crypto" - "OP_CHECKLOCKTIMEVERIFY": "https://en.bitcoin.it/wiki/Script#Locktime" - - "OP_CHECKSEQUENCEVERIFY ": "https://en.bitcoin.it/wiki/Script#Locktime" + - "OP_CHECKSEQUENCEVERIFY ": "https://en.bitcoin.it/wiki/Script#Locktime" - "OP_PUBKEYHASH (invalid)": "https://en.bitcoin.it/wiki/Script#Pseudo-words" - "OP_PUBKEY (invalid)": "https://en.bitcoin.it/wiki/Script#Pseudo-words" @@ -533,10 +533,10 @@ devsearches: - "BIP73: accept header with payment protocol": "https://github.com/bitcoin/bips/blob/master/bip-0073.mediawiki" - "BIP111: NODE_BLOOM service bit": "https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki" - "BIP112: OP_CHECKSEQUENCEVERIFY": "https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki" - - "BIP113: median time for lock-time": "https://github.com/bitcoin/bips/blob/master/bip-0113.mediawiki" + - "BIP113: median time for lock-time": "https://github.com/bitcoin/bips/blob/master/bip-0113.mediawiki" - "BIP125: replace-by-fee signaling": "https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki" - "BIP130: sendheaders message": "https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki" - - "BIP133: feefilter message": "https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki" + - "BIP133: feefilter message": "https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki" - "BIP141: segregated witness": "https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki" - "BIP151: P2P communication encryption": "https://github.com/bitcoin/bips/blob/master/bip-0151.mediawiki" - "BIP152: compact block relay": "https://github.com/bitcoin/bips/blob/master/bip-0152.mediawiki" @@ -577,7 +577,9 @@ collections: permalink: /en/release/:path ## _wallets wallets: - output: false + output: true + permalink: /en/wallets/:path/ + ## _platforms platforms: output: true permalink: /en/wallets/:path/ @@ -600,12 +602,16 @@ defaults: - bcc - bcc news - RELEASE + - scope: + path: "" + type: wallets + values: + layout: wallet-container - scope: path: "" type: platforms values: - layout: base - + layout: wallet-platform - scope: path: "" type: posts From d3b7128f7426521eda9decd70a9fac0dadb26491 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Mon, 17 Jul 2017 22:21:36 +0200 Subject: [PATCH 12/37] Adds styles for a wallet layout. --- _sass/_wallets.scss | 185 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 168 insertions(+), 17 deletions(-) diff --git a/_sass/_wallets.scss b/_sass/_wallets.scss index 17812eeb..3202b418 100644 --- a/_sass/_wallets.scss +++ b/_sass/_wallets.scss @@ -228,6 +228,8 @@ border: 1px solid #BDBDBD; } +// ----------------------------- new + $checks: control, validation, @@ -239,8 +241,10 @@ $checks: $green: #329239; $grey: #8b8b8b; $red: #ee9209; +$blue: #2c6faf; +$light-blue: #f0f8ff; -$checkmarks: +$scores: good $green bold, pass $green normal, neutral $grey normal, @@ -248,31 +252,178 @@ $checkmarks: .wallet { - // Generate backgrounds for checks and checkmarks - @each $check in $checks { - @each $checkmark, $color, $font-weight in $checkmarks { - .check#{$checkmark} { - color: $color; - font-weight: $font-weight; + .wallet-logo-container { + text-align: center; - p { - border-color: $color; - font-weight: normal; + .wallet-logo { + width: 72px; + height: 72px; + } + + h1 { + text-align: center; + } + } + + .wallet-platforms { + + .wallet-platforms-menu { + text-align: center; + margin-bottom: 20px; + + button { + background-color: transparent; + font-weight: bold; + border: 1px solid #255f96; + margin-right: 10px; + text-decoration: none; + padding: 4px 8px; + border-radius: 4px; + text-align: center; + + span { + vertical-align: text-top; + } + } + } + + .wallet-os-container { + background-color: $light-blue; + padding: 20px; + border: 2px solid $blue; + border-radius: 4px; + margin-bottom: 20px; + display: flex; + + .wallet-os-screenshot { + img { + border: 1px solid $grey; + } + } + + .wallet-os-overview { + flex: 1; + display: flex; + flex-direction: column; + + .wallet-os-name { + h3 { + margin: 0; + margin-right: 5px; + display: inline-block; + vertical-align: top; + } + + margin-bottom: 20px; } - > div > span { - @if $checkmark == good { - background-image: url('/img/icons/checkbubble_pass.svg'); - } @else { - background-image: url('/img/icons/checkbubble_#{$checkmark}.svg'); + .wallet-os-download-buttons { + margin-bottom: 20px; + + .wallet-os-source-link, + .wallet-os-download-link { + font-weight: bold; + border: 1px solid #255f96; + margin-right: 10px; + text-decoration: none; + padding: 4px 8px; + border-radius: 4px; + text-align: center; + } + + .wallet-os-download-link { + background-color: #2c6fad; + background-image: -o-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); + background-image: -moz-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); + background-image: -webkit-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); + background-image: -ms-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); + background-image: linear-gradient(bottom, #255f96 14%, #2c6fad 70%); + color: #fff; + + &:hover { + background-image: none; + } + } + + .wallet-os-source-link { } } + .wallet-os-checks { + padding-right: 40px; + + .wallet-os-check-title { + display: inline-block; + margin: 0; + } + + .wallet-os-check-help-icon { + display: inline-block; + background-image: url(/img/icons/wallet_help.png); + background-image: none, url(/img/icons/wallet_help.svg), url(/img/icons/wallet_help.png); + width: 16px; + height: 16px; + vertical-align: text-bottom; + cursor: pointer; + } + + .hover { + .wallet-os-check-details { + display: block; + border: 2px solid; + border-radius: 4px; + margin: 10px 0; + padding: 10px; + } + } + + .wallet-os-check-details { + display: none; + position: absolute; + background-color: #FFFFFF; + max-width: 350px; + p { + margin: 0; + text-align: left; + } + } + } + } + } + } + + // Generate backgrounds for checks and scores + @each $score, $color, $font-weight in $scores { + .check#{$score} { + background-repeat: no-repeat; + background-position-y: center; + padding-left: 25px; + margin-bottom: 10px; + + .wallet-os-check-title { + color: $color; + font-weight: $font-weight; + } + + .wallet-os-check-details { + color: $color; + border-color: $color; + } + + > div > span { + @if $score == good { + background-image: url('/img/icons/checkbubble_pass.svg'); + } @else { + background-image: url('/img/icons/checkbubble_#{$score}.svg'); + } + } + + @each $check in $checks { &.check#{$check} { - @if $checkmark == good { + @if $score == good { background-image: url('/img/icons/check_#{$check}_pass.svg'); } @else { - background-image: url('/img/icons/check_#{$check}_#{$checkmark}.svg'); + background-image: url('/img/icons/check_#{$check}_#{$score}.svg'); } } } From 77967948586c58499d57c80824618e44dfeeda38 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Mon, 17 Jul 2017 22:22:39 +0200 Subject: [PATCH 13/37] Simplifies layouts for wallet platforms and wallet details. --- _includes/layout/base/wallets-list.html | 17 ++++ _includes/layout/base/wallets-menu.html | 34 ++++++++ _includes/templates/wallet-platform.html | 44 ----------- _layouts/wallet-container.html | 99 ++++++++++++++++++++++++ _layouts/wallet-platform-container.html | 18 +++++ _layouts/wallet-platform.html | 9 +++ _platforms/desktop/linux.html | 3 - _platforms/desktop/mac.html | 3 - _platforms/desktop/windows.html | 3 - _platforms/hardware.html | 3 - _platforms/mobile/android.html | 3 - _platforms/mobile/blackberry.html | 3 - _platforms/mobile/ios.html | 3 - _platforms/mobile/windowsphone.html | 3 - _platforms/web.html | 3 - 15 files changed, 177 insertions(+), 71 deletions(-) create mode 100644 _includes/layout/base/wallets-list.html create mode 100644 _includes/layout/base/wallets-menu.html delete mode 100644 _includes/templates/wallet-platform.html create mode 100644 _layouts/wallet-container.html create mode 100644 _layouts/wallet-platform-container.html create mode 100644 _layouts/wallet-platform.html diff --git a/_includes/layout/base/wallets-list.html b/_includes/layout/base/wallets-list.html new file mode 100644 index 00000000..b27d19c3 --- /dev/null +++ b/_includes/layout/base/wallets-list.html @@ -0,0 +1,17 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% if wallet.compat contains page.platform and wallet.compat contains page.os %} +{% endif %} +{% endcomment %} + +
+{% for wallet in site.wallets %} + +{% endfor %} +
diff --git a/_includes/layout/base/wallets-menu.html b/_includes/layout/base/wallets-menu.html new file mode 100644 index 00000000..965b27dd --- /dev/null +++ b/_includes/layout/base/wallets-menu.html @@ -0,0 +1,34 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+{% assign platformsByPlatform = site.platforms | group_by: "platform" %} +
    + {% for platform in platformsByPlatform %} + {% assign platform_class = "wallet-" | append: platform.name %} + {% if page.id contains platform.name %} + {% assign platform_class = platform_class | append: " active" %} + {% endif %} +
  • + {% translate walletcat{{platform.name}} choose-your-wallet %} + {% if platform.items.size > 1 %} + + {% endif %} +
  • + {% endfor %} +
+
diff --git a/_includes/templates/wallet-platform.html b/_includes/templates/wallet-platform.html deleted file mode 100644 index 1af5a150..00000000 --- a/_includes/templates/wallet-platform.html +++ /dev/null @@ -1,44 +0,0 @@ -{% comment %} -This file is licensed under the MIT License (MIT) available on -http://opensource.org/licenses/MIT. -{% endcomment %} - -

{% translate pagetitle %}

-

{% translate pagedesc %}

- - - -
-{% for wallet in site.wallets %} - {% if wallet.compat contains page.platform and wallet.compat contains page.os %} - - {% endif %} -{% endfor %} -
diff --git a/_layouts/wallet-container.html b/_layouts/wallet-container.html new file mode 100644 index 00000000..9ee7c375 --- /dev/null +++ b/_layouts/wallet-container.html @@ -0,0 +1,99 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: wallet-platform-container +--- + +
+ +
+ +

+ {{ page.title }} +

+
+ +

+ {% translate wallet{{page.id}} choose-your-wallet %} +

+ +
+
+ {% for platform in page.platform %} + {% for os in platform.os %} + + {% endfor %} + {% endfor %} +
+
+ {% for platform in page.platform %} + {% for os in platform.os %} +
+
+
+ {% translate platform{{os.name}} choose-your-wallet %} +

{% translate platform{{os.name}} choose-your-wallet %}

+
+
+ {% if os.link == 'bitcoincore' %} + {% translate walletdownload choose-your-wallet %} + {% elsif os.link contains 'play.google.com' or os.link contains 'itunes.apple.com' or os.link contains 'chrome.google.com' %} + {% translate walletdownload choose-your-wallet %} + {% else %} + {% translate walletvisit choose-your-wallet %} + {% endif %} + {% if os.source %} + {% translate walletsourcecode choose-your-wallet %} + {% endif %} +
+
+ {% for check in os.check %} + {% assign checkName = check[0] %} + {% assign checkValue = check[1] %} +
+

+ {% translate {{checkValue}} choose-your-wallet %} +

+
+
+

{% translate {{checkValue}}txt choose-your-wallet %}

+ {% if checkName == 'privacy' and os.privacycheck %} + {% for privacycheck in os.privacycheck %} +
+

{% translate {{privacycheck[1]}} choose-your-wallet %}

+

{% translate {{privacycheck[1]}}txt choose-your-wallet %}

+
+ {% endfor %} + {% endif %} +
+
+ {% endfor %} +
+
+
+ screenshot +
+
+ {% endfor %} + {% endfor %} +
+
+ + +
diff --git a/_layouts/wallet-platform-container.html b/_layouts/wallet-platform-container.html new file mode 100644 index 00000000..8443391a --- /dev/null +++ b/_layouts/wallet-platform-container.html @@ -0,0 +1,18 @@ +--- +layout: base +--- + +{{ content }} + +{% include layout/base/wallets-menu.html %} +{% include layout/base/wallets-list.html %} + +
+

+ warning + {% translate educate choose-your-wallet %} +

+

+ {% translate educatetxt choose-your-wallet %} +

+
diff --git a/_layouts/wallet-platform.html b/_layouts/wallet-platform.html new file mode 100644 index 00000000..5291aed4 --- /dev/null +++ b/_layouts/wallet-platform.html @@ -0,0 +1,9 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: wallet-platform-container +--- + +

{% translate pagetitle choose-your-wallet %}

+

{% translate pagedesc choose-your-wallet %}

diff --git a/_platforms/desktop/linux.html b/_platforms/desktop/linux.html index f36b7856..ec4be7eb 100644 --- a/_platforms/desktop/linux.html +++ b/_platforms/desktop/linux.html @@ -2,11 +2,8 @@ # This file is licensed under the MIT License (MIT) available on # http://opensource.org/licenses/MIT. -layout: base id: wallets-desktop-linux platform: desktop os: linux --- -{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} - diff --git a/_platforms/desktop/mac.html b/_platforms/desktop/mac.html index 2d6eac79..37598089 100644 --- a/_platforms/desktop/mac.html +++ b/_platforms/desktop/mac.html @@ -2,10 +2,7 @@ # This file is licensed under the MIT License (MIT) available on # http://opensource.org/licenses/MIT. -layout: base id: wallets-desktop-mac platform: desktop os: mac --- - -{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/desktop/windows.html b/_platforms/desktop/windows.html index 3fa1cfd2..c761b19b 100644 --- a/_platforms/desktop/windows.html +++ b/_platforms/desktop/windows.html @@ -2,10 +2,7 @@ # This file is licensed under the MIT License (MIT) available on # http://opensource.org/licenses/MIT. -layout: base id: wallets-desktop-windows platform: desktop os: windows --- - -{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/hardware.html b/_platforms/hardware.html index 9b5639e6..cecdf972 100644 --- a/_platforms/hardware.html +++ b/_platforms/hardware.html @@ -2,9 +2,6 @@ # This file is licensed under the MIT License (MIT) available on # http://opensource.org/licenses/MIT. -layout: base id: wallets-hardware platform: hardware --- - -{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/mobile/android.html b/_platforms/mobile/android.html index f036207c..bc0196cd 100644 --- a/_platforms/mobile/android.html +++ b/_platforms/mobile/android.html @@ -2,10 +2,7 @@ # This file is licensed under the MIT License (MIT) available on # http://opensource.org/licenses/MIT. -layout: base id: wallets-mobile-android platform: mobile os: android --- - -{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/mobile/blackberry.html b/_platforms/mobile/blackberry.html index e7dd8daf..c2fe3788 100644 --- a/_platforms/mobile/blackberry.html +++ b/_platforms/mobile/blackberry.html @@ -2,10 +2,7 @@ # This file is licensed under the MIT License (MIT) available on # http://opensource.org/licenses/MIT. -layout: base id: wallets-mobile-blackberry platform: mobile os: blackberry --- - -{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/mobile/ios.html b/_platforms/mobile/ios.html index 8cfb658e..75a42751 100644 --- a/_platforms/mobile/ios.html +++ b/_platforms/mobile/ios.html @@ -2,10 +2,7 @@ # This file is licensed under the MIT License (MIT) available on # http://opensource.org/licenses/MIT. -layout: base id: wallets-mobile-ios platform: mobile os: ios --- - -{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/mobile/windowsphone.html b/_platforms/mobile/windowsphone.html index 1944fa2a..29fc7a57 100644 --- a/_platforms/mobile/windowsphone.html +++ b/_platforms/mobile/windowsphone.html @@ -2,10 +2,7 @@ # This file is licensed under the MIT License (MIT) available on # http://opensource.org/licenses/MIT. -layout: base id: wallets-mobile-windowsphone platform: mobile os: windowsphone --- - -{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} diff --git a/_platforms/web.html b/_platforms/web.html index a34b90f5..34afb073 100644 --- a/_platforms/web.html +++ b/_platforms/web.html @@ -2,9 +2,6 @@ # This file is licensed under the MIT License (MIT) available on # http://opensource.org/licenses/MIT. -layout: base id: wallets-web platform: web --- - -{% include templates/wallet-platform.html platform=page.platform os=page.os id=page.id %} From eca2d54ddbfeba1583130e8691928ecdd9a45166 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Mon, 17 Jul 2017 22:23:38 +0200 Subject: [PATCH 14/37] Renames walletbitcoinqt to walletbitcoincore in translations. --- _translations/ar.yml | 2 +- _translations/bg.yml | 2 +- _translations/da.yml | 2 +- _translations/de.yml | 2 +- _translations/el.yml | 2 +- _translations/en.yml | 2 +- _translations/es.yml | 2 +- _translations/fa.yml | 2 +- _translations/fr.yml | 2 +- _translations/hi.yml | 2 +- _translations/hu.yml | 2 +- _translations/id.yml | 2 +- _translations/it.yml | 2 +- _translations/ja.yml | 2 +- _translations/ko.yml | 2 +- _translations/nl.yml | 2 +- _translations/pl.yml | 2 +- _translations/pt_BR.yml | 2 +- _translations/ro.yml | 2 +- _translations/ru.yml | 2 +- _translations/sl.yml | 2 +- _translations/sv.yml | 2 +- _translations/tr.yml | 2 +- _translations/uk.yml | 2 +- _translations/zh_CN.yml | 2 +- _translations/zh_TW.yml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/_translations/ar.yml b/_translations/ar.yml index 831fa717..4ef75a63 100644 --- a/_translations/ar.yml +++ b/_translations/ar.yml @@ -105,7 +105,7 @@ ar: walletcatdesktop: "المكتبي" walletcathardware: "العتاد" walletcatweb: "الويب" - walletbitcoinqt: "Bitcoin Core هو برنامج البت كوين الرسمي، وهو برنامج متكامل يمثل العمود الفقري للشبكة. يوفر هذا البرنامج مستويات عالية من الأمان والخصوصية والثبات. ولكن، ميزاته أقل ويستهلك الكثير من المساحة والذاكرة." + walletbitcoincore: "Bitcoin Core هو برنامج البت كوين الرسمي، وهو برنامج متكامل يمثل العمود الفقري للشبكة. يوفر هذا البرنامج مستويات عالية من الأمان والخصوصية والثبات. ولكن، ميزاته أقل ويستهلك الكثير من المساحة والذاكرة." walletmultibit: "MultiBit هو برنامج عميل بت كوين خفيف يركز على كونه سريع و سهل الإستخدام. يقوم البرنامج بالمزامنة مع الشبكة ويصبح جاهزاً للإستخدام في دقائق. MultiBit يدعم أيضاً عدة لغات. وهو خيار جيد للمستخدمين غير التقنيين." walletarmory: "Armory هو عميل بت كوين متقدم يقدم الكثير من المميزات لمستخدمي البت كوين المحترفين. يوفر البرنامج العديد من الخصائص للنسخ الإحتياطي والتشفير، كما يدعم التخزين البارد على أجهزة الكمبيوتر غير المرتبطة بالإنترنت." walletelectrum: "Electrum هو برنامج آخر تركيزه الأساسي هو السرعة والبساطة، مع إستخدام قليل للموارد. يقوم البرنامج بإستخدام سيرفرات تقوم بمعالحة الأجزاء الأكثر تعقيداً في نظام البت كوين كما يسمح لك بإستعادة محفظتك بإستخدام كلمة سر." diff --git a/_translations/bg.yml b/_translations/bg.yml index 6ba4b3cc..2a0b3b40 100644 --- a/_translations/bg.yml +++ b/_translations/bg.yml @@ -105,7 +105,7 @@ bg: walletcatdesktop: "Работен плот" walletcathardware: "Хардуер" walletcatweb: "Уеб" - walletbitcoinqt: "Bitcoin Core e целият Биткойн клиент, който изгражда основата на мрежата. Той предлага най-високо ниво на сигурност, защита на личните данни и стабилност. Недостатъците му са, че има по-малко опции и заема много място и памет." + walletbitcoincore: "Bitcoin Core e целият Биткойн клиент, който изгражда основата на мрежата. Той предлага най-високо ниво на сигурност, защита на личните данни и стабилност. Недостатъците му са, че има по-малко опции и заема много място и памет." walletmultibit: "Multibit е лек клиент, фокусиран върху бързината, който същевременно е лесен за използване. Бързо се синхронизира с мрежата и е готов за действие след много кратко време. Multibit поддържа много езици и е добър избор за потребителите със скромни технически познания." walletarmory: "Armory е усъвършенстван Биткойн клиент, който има разширени функции за напреднали потребители. Той предлага много възможности за архивиране и криптиране, като дори позволява един от най-сигурните начини за съхранение - \"студен склад\" (cold storage) на офлайн компютри." walletelectrum: "Electrum е фокусиран в постигането на висока скорост с много малки ресурси, като същевременно е и лесен за ползване. Electrum използва отдалечени сървъри, които се справят с най-сложните части на Биткойн системата и Ви позволява да възстановите паролата си чрез използването на тайна фраза. " diff --git a/_translations/da.yml b/_translations/da.yml index b81276bb..01715d45 100644 --- a/_translations/da.yml +++ b/_translations/da.yml @@ -105,7 +105,7 @@ da: walletcatdesktop: "Skrivebord" walletcathardware: "Hardware" walletcatweb: "Web" - walletbitcoinqt: "Bitcoin Core er en komplet Bitcoin-klient, og den udgør rygraden af netværket. Den tilbyder et højt niveau af sikkerhed, privatlivsbeskyttelse og stabilitet. Den har dog færre funktioner og den optager store mængder plads og hukommelse." + walletbitcoincore: "Bitcoin Core er en komplet Bitcoin-klient, og den udgør rygraden af netværket. Den tilbyder et højt niveau af sikkerhed, privatlivsbeskyttelse og stabilitet. Den har dog færre funktioner og den optager store mængder plads og hukommelse." walletmultibit: "MultiBit er en letvægtsklient, som fokuserer på at være hurtig og nem at bruge. Den synkroniserer med netværket og er klar til brug på minutter. MultiBit understøtter også mange sprog. Den er et godt valg for ikke-tekniske brugere." walletarmory: "Armory er en avanceret Bitcoin-klient, som giver udvidede funktionaliteter for Bitcoin-superbrugere. Den tilbyder mange funktionaliteter for sikkerhedskopiering og kryptering, og den tillader sikker \"kold opbevaring\" på offline-computere." walletelectrum: "Electrum fokuserer på hastighed og simplicitet med lav ressourcebrug. Den gør brug af fjerne servere, som håndterer de mest komplicerede dele af Bitcoin-systemet, og den tillader dig at genskabe din tegnebog udfra en hemmelig sætning." diff --git a/_translations/de.yml b/_translations/de.yml index 8ccb79d1..cfb709b2 100644 --- a/_translations/de.yml +++ b/_translations/de.yml @@ -105,7 +105,7 @@ de: walletcatdesktop: "Desktop" walletcathardware: "Hardware" walletcatweb: "Web" - walletbitcoinqt: "Bitcoin Core ist ein kompletter Bitcoin-Client und bildet das Rückgrat des Netzwerks. Er bietet ein Höchstmaß an Sicherheit, Privatsphäre und Stabilität. Er hat allerdings weniger Funktionen und benötigt viel Festplatten- und Arbeitsspeicher." + walletbitcoincore: "Bitcoin Core ist ein kompletter Bitcoin-Client und bildet das Rückgrat des Netzwerks. Er bietet ein Höchstmaß an Sicherheit, Privatsphäre und Stabilität. Er hat allerdings weniger Funktionen und benötigt viel Festplatten- und Arbeitsspeicher." walletmultibit: "MultiBit ist ein leichtgewichtiger Client mit Schwerpunkt auf Geschwindigkeit und einfacher Nutzbarkeit. Er synchronisiert sich mit dem Netzwerk und ist in wenigen Minuten einsatzbereit. MultiBit unterstützt verschiedene Sprachen. Er ist eine gute Wahl für nicht-technische Nutzer." walletarmory: "Armory ist ein erweiterter Bitcoin-Client, der Funktionalitäten für Bitcoin-Power-User ergänzt. Er bietet viele Backup- und Verschlüsselungsfunktionen und ermöglicht sicheres Speichern auf Offline-Rechnern." walletelectrum: "Electrum ist auf Geschwindigkeit und Einfachheit fokussiert und benötigt wenig Ressourcen. Es verwendet entfernte Server um die kompliziertesten Teile des Bitcoin-Systems zu übernehmen und ermöglicht es, mit einer geheimen Phrase wieder Zugriff auf eine Wallet zu bekommen." diff --git a/_translations/el.yml b/_translations/el.yml index 3ba61bca..e91bb7cc 100644 --- a/_translations/el.yml +++ b/_translations/el.yml @@ -105,7 +105,7 @@ el: walletcatdesktop: "Επιφάνεια εργασίας" walletcathardware: "Υλισμικό" walletcatweb: "Δίκτυο" - walletbitcoinqt: "To Bitcoin Core είναι ένας πλήρης πελάτης Bitcoin και φτιάχνει τη ραχοκοκαλιά του δικτύου. Προσφέρει υψηλά επίπεδα ασφάλειας, προστασία προσωπικών δεδομένων και σταθερότητα. Ωστόσο, έχει λιγότερες δυνατότητες και καταλαμβάνει περισσότερο χώρο και μνήμη." + walletbitcoincore: "To Bitcoin Core είναι ένας πλήρης πελάτης Bitcoin και φτιάχνει τη ραχοκοκαλιά του δικτύου. Προσφέρει υψηλά επίπεδα ασφάλειας, προστασία προσωπικών δεδομένων και σταθερότητα. Ωστόσο, έχει λιγότερες δυνατότητες και καταλαμβάνει περισσότερο χώρο και μνήμη." walletmultibit: "Το MultiBit είναι ένας ελαφρύς πελάτης που εστιάζει στην ταχύτητα και στην ευκολία χρήσης. Συγχρονίζεται με το δίκτυο και είναι έτοιμος για χρήση σε μερικά λεπτά. Το MultiBit υποστηρίζει επίσης πολλές γλώσσες. Είναι μια καλή επιλογή για τους μη τεχνικούς χρήστες." walletarmory: "To Armory είναι ένας εξελιγμένος πελάτης Bitcoin ο οποίος διευρύνει τις δυνατότητές του για τους έμπειρους χρήστες του Bitcoin. Προσφέρει πολλές δυνατότητες για αντίγραφα ασφαλείας και κρυπτογράφηση και επιτρέπει ασφαλή \"αποθήκευση στην κατάψυξη\" (cold-storage) σε υπολογιστές εκτός σύνδεσης." walletelectrum: "Το Electrum εστιάζει στην ταχύτητα και στην απλότητα με χαμηλή χρήση πόρων. Χρησιμοποιεί απομακρυσμένους διακομιστές που διαχειρίζονται τα πιο περίπλοκα τμήματα του συστήματος Bitcoin και σας επιτρέπει να ανακτήσετε το πορτοφόλι σας με μια μυστική φράση." diff --git a/_translations/en.yml b/_translations/en.yml index 3342ae53..c02da432 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -169,7 +169,7 @@ walletcatdesktop: "Desktop" walletcathardware: "Hardware" walletcatweb: "Web" - walletbitcoinqt: "Bitcoin Core is a full Bitcoin client and builds the backbone of the network. It offers high levels of security, privacy, and stability. However, it has fewer features and it takes a lot of space and memory." + walletbitcoincore: "Bitcoin Core is a full Bitcoin client and builds the backbone of the network. It offers high levels of security, privacy, and stability. However, it has fewer features and it takes a lot of space and memory." walletbitcoinknots: "Bitcoin Knots is a full Bitcoin client and builds the backbone of the network. It offers high levels of security, privacy, and stability. It includes more advanced features than Bitcoin Core, but they are not as well-tested. It uses a lot of space and memory." walletmultibithd: "MultiBit HD is a lightweight client that is fast and easy to use. With integrated Trezor and Tor support, it synchronizes directly with the Bitcoin network. The extensive help makes it an excellent choice for non-technical users." walletarmory: "Armory is an advanced Bitcoin client that expands its features for Bitcoin power users. It offers many backup and encryption features, and it allows secure cold-storage on offline computers." diff --git a/_translations/es.yml b/_translations/es.yml index d902f88c..60e1e885 100644 --- a/_translations/es.yml +++ b/_translations/es.yml @@ -112,7 +112,7 @@ es: walletcatdesktop: "Escritorio" walletcathardware: "Hardware" walletcatweb: "Web" - walletbitcoinqt: "Bitcoin Core es un cliente completo de Bitcoin y representa la columna vertebral de la red. Este ofrece altos niveles de seguridad, privacidad y estabilidad. Sin embargo, tiene menos prestaciones y ocupa demasiado espacio y memoria." + walletbitcoincore: "Bitcoin Core es un cliente completo de Bitcoin y representa la columna vertebral de la red. Este ofrece altos niveles de seguridad, privacidad y estabilidad. Sin embargo, tiene menos prestaciones y ocupa demasiado espacio y memoria." walletmultibit: "MultiBit es un programa ligero que se centra en ser rápido y fácil de usar. Se sincroniza con la red y está listo para usarse en minutos. MultiBit también esta disponible en varios idiomas. Es una buena opción para los usuarios que no son técnicos." walletarmory: "Armory es un cliente avanzado de Bitcoin que amplia sus características para usuarios avanzados. Ofrece muchas opciones para respaldar, encriptar y permitir el almacenamiento de su monedero en ordenadores sin conexión." walletelectrum: "Electrum se enfoca en la sencillez y velocidad, con poco uso de recursos. Utiliza servidores remotos que se encargan de las partes más complejas del sistema Bitcoin, y le permite recuperar su monedero por medio de una frase secreta." diff --git a/_translations/fa.yml b/_translations/fa.yml index dd1b3f56..050b7be6 100644 --- a/_translations/fa.yml +++ b/_translations/fa.yml @@ -105,7 +105,7 @@ fa: walletcatdesktop: "میزکار" walletcathardware: "سخت‌افزار" walletcatweb: "وب" - walletbitcoinqt: "هسته بیت کوین یک کلاینت بیت کوینی کامل است که ستون فقرات شبکه را تشکیل داده و سطح بالایی از امنیت، حریم خصوصی و پایداری را تامین می کند. هر چند که ویژگیهای کمتری دارد و فضا و حافظه زیادی را اشغال میکند." + walletbitcoincore: "هسته بیت کوین یک کلاینت بیت کوینی کامل است که ستون فقرات شبکه را تشکیل داده و سطح بالایی از امنیت، حریم خصوصی و پایداری را تامین می کند. هر چند که ویژگیهای کمتری دارد و فضا و حافظه زیادی را اشغال میکند." walletmultibit: "MultiBit یک کلاینت کم حجم است که براستفاده سریع و آسان تاکید دارد. در کمتر از چند دقیقه با شبکه همگام و آماده استفاده می شود. MultiBit همچنین از بسیاری از زبانها نیز پشتیبانی می کند و گزینه خوبی برای کاربران نا آشنا با تکنولوژی است." walletarmory: "آرموری یک کلاینت بیت کوینی پیشرفته است که ویژگیهای خود را برای کاربران صاحب اختیارتر بیت کوین، گسترش داده است. ویژگیهای پشتیبان گیری و رمزنگاری دارد و اجازه ذخیره سازی امن روی کامپیوترهای آفلاین را میدهد." walletelectrum: "تاکید Electrum بر سرعت، ساده سازی و استفاده کم از منابع است. از سرورهای راه دوری که پیچیده ترین قسمتهای سیستم بیت کوین را مدیریت می کنند، استفاده کرده و به شما اجازه می دهد تا کیف پول خود را به وسیله یک عبارت محرمانه بازیابی کنید." diff --git a/_translations/fr.yml b/_translations/fr.yml index 14e0e5a2..c6157c11 100644 --- a/_translations/fr.yml +++ b/_translations/fr.yml @@ -105,7 +105,7 @@ fr: walletcatdesktop: "Bureau" walletcathardware: "Matériel" walletcatweb: "Web" - walletbitcoinqt: "Bitcoin Core est un client Bitcoin complet sur lequel s'appuie le réseau. Il offre un haut niveau de sécurité, de confidentialité et de stabilité. Toutefois, il offre moins de fonctions et prend beaucoup d'espace et de mémoire." + walletbitcoincore: "Bitcoin Core est un client Bitcoin complet sur lequel s'appuie le réseau. Il offre un haut niveau de sécurité, de confidentialité et de stabilité. Toutefois, il offre moins de fonctions et prend beaucoup d'espace et de mémoire." walletmultibit: "MultiBit est un client léger qui priorise la rapidité et la facilité d'utilisation. Il se synchronise avec le réseau et est prêt en quelques minutes. MultiBit est aussi disponible en plusieurs langues. C'est un bon choix pour les novices." walletarmory: "Armory est un client Bitcoin évolué offrant plus de fonctions pour les super-utilisateurs. Il offre plusieurs fonctions de sauvegarde et de chiffrement et permet un stockage à froid sécurisé sur des ordinateurs déconnectés du réseau." walletelectrum: "Electrum se concentre sur la rapidité et la simplicité. Il est très léger et utilise des serveurs distants s'occupant des aspects les plus complexes du système Bitcoin. Electrum vous permet aussi de récupérer votre portefeuille à l'aide d'une phrase secrète." diff --git a/_translations/hi.yml b/_translations/hi.yml index af2becf0..78efd889 100644 --- a/_translations/hi.yml +++ b/_translations/hi.yml @@ -105,7 +105,7 @@ hi: walletcatdesktop: "डेस्कटॉप" walletcathardware: "हार्डवेयर" walletcatweb: "वेब" - walletbitcoinqt: "Bitcoin कोर Bitcoin ग्राहकों से भरा है और नेटवर्क के ढाचे को मजबूत बनाता है। यह उच्च स्तर की सुरक्षा, गोपनीयता और स्थिरता. प्रदान करता है। लेकिन, इसमें कुछ कम सुविधाएं है और यह काफी ज्यादा जगह और मेमोरी लेता है।" + walletbitcoincore: "Bitcoin कोर Bitcoin ग्राहकों से भरा है और नेटवर्क के ढाचे को मजबूत बनाता है। यह उच्च स्तर की सुरक्षा, गोपनीयता और स्थिरता. प्रदान करता है। लेकिन, इसमें कुछ कम सुविधाएं है और यह काफी ज्यादा जगह और मेमोरी लेता है।" walletmultibit: " Multibit एक हल्का ग्राहक है जो तेजी और आसानी से उपयोग पर केंद्रित है। यह नेटवर्क के साथ सिंक्रनाइज़ करता हैं और मिनटों में उपयोग करने के लिए तैयार होता है। Multibit कई भाषाओं का समर्थन करता है। यह गैर तकनीकी उपयोगकर्ताओं के लिए एक अच्छा विकल्प है।" walletarmory: "Armory एक उन्नत Bitcoin ग्राहक है जो पावर उपयोगकर्ताओं के लिए सुविधाओं को विस्तारित करता है। यह कई बैकअप और एन्क्रिप्शन सुविधाएँ प्रदान करता है और ऑफ़लाइन कंप्यूटर पर सुरक्षित भंडारण की अनुमति देता है।" walletelectrum: "Electrum का ध्यान कम संसाधनों के उपयोग के साथ, गति और सादगी पर होता है। यह Bitcoin प्रणाली का सबसे जटिल भागों को संभालता है दूरस्थ सर्वर के उपयोग से। और यह आपको एक गुप्त वाक्यांश से अपने बटुए को वापस लाने मे मदद देता है।" diff --git a/_translations/hu.yml b/_translations/hu.yml index 50c2a76c..5e09d3b3 100644 --- a/_translations/hu.yml +++ b/_translations/hu.yml @@ -105,7 +105,7 @@ hu: walletcatdesktop: "Asztali gép" walletcathardware: "Hardver" walletcatweb: "Web" - walletbitcoinqt: "A Bitcoin Core egy teljes Bitcoin-kliens, és a hálózat gerincét képzi. Magas szintű biztonságot, titkosságot és stabilitást kínál. Azonban kevesebb szolgáltatást nyújt, illetve sok helyet és memóriát használ." + walletbitcoincore: "A Bitcoin Core egy teljes Bitcoin-kliens, és a hálózat gerincét képzi. Magas szintű biztonságot, titkosságot és stabilitást kínál. Azonban kevesebb szolgáltatást nyújt, illetve sok helyet és memóriát használ." walletmultibit: "A MultiBit egy pehelykönnyű kliens, amely a gyors működésre és az egyszerű használatra koncentrál. Szinkronizálódik a hálózattal, és percek alatt használatra kész. A MultiBit ugyanakkor számos nyelvet támogat. Jó választás számítástechnikai háttérrel nem rendelkező felhasználók számára." walletarmory: "Az Armory egy haladó ismereteket igénylő Bitcoin-kliens, amely szolgáltatásaival a Bitcoin kiemelt felhasználóit célozza. Számos biztonsági mentési, valamint titkosítási szolgáltatást kínál, és lehetőséget teremt a hidegtárolások interneteléréssel nem rendelkező számítógépen való biztonságos elhelyezésére." walletelectrum: "Az Electrum fókuszában a sebesség és az egyszerűség áll, alacsony erőforrás-használattal párosulva. Távoli szervereket használ a Bitcoin rendszere legbonyolultabb részeinek kezeléshez, és lehetővé teszi pénztárcája visszaállítását egy titkos szó(kapcsolat) segítségével." diff --git a/_translations/id.yml b/_translations/id.yml index 18616f9e..aa451e82 100644 --- a/_translations/id.yml +++ b/_translations/id.yml @@ -105,7 +105,7 @@ id: walletcatdesktop: "Komputer meja" walletcathardware: "Perangkat Keras" walletcatweb: "Web" - walletbitcoinqt: "Bitcoin Core adalah klien Bitcoin penuh dan membangun tulang punggung dari jaringan. Bitcoin Core menawarkan keamanan, privasi, dan stabilitas tingkat tinggi. Meski demikian, Bitcoin Core memiliki sedikit fitur dan memerlukan banyak ruang dan memori." + walletbitcoincore: "Bitcoin Core adalah klien Bitcoin penuh dan membangun tulang punggung dari jaringan. Bitcoin Core menawarkan keamanan, privasi, dan stabilitas tingkat tinggi. Meski demikian, Bitcoin Core memiliki sedikit fitur dan memerlukan banyak ruang dan memori." walletmultibit: "MultiBit adalah sebuah klien ringan yang berfokus pada kecepatan dan kemudahan dalam pemakaian. MultiBit bersinkronisasi dengan jaringan dan dapat digunakan dalam hitungan menit. MultiBit juga mendukung banyak bahasa. Merupakan pilihan yang baik untuk pengguna awam." walletarmory: "Armory adalah klien Bitcoin yang canggih yang mengekspansi fiturnya untuk para pengguna ahli Bitcoin. Armory menawarkan banyak fitur pencadangan dan enkripsi, serta memungkinkan pengamanan \"cold-storage\" pada komputer offline." walletelectrum: "Electrum berfokus pada kecepatan dan kesederhanaan, dengan penggunaan sumber daya yang rendah. Eelctrum menggunakan server jauh yang menangani bagian paling rumit pada sistem Bitcoin, serta memungkinkan Anda untuk memulihkan dompet Anda dengan frase rahasia." diff --git a/_translations/it.yml b/_translations/it.yml index e0f1b2d0..f68f4a82 100644 --- a/_translations/it.yml +++ b/_translations/it.yml @@ -105,7 +105,7 @@ it: walletcatdesktop: "Desktop" walletcathardware: "Hardware" walletcatweb: "Web" - walletbitcoinqt: "Bitcoin Core è un client Bitcoin completo e costruisce la spina dorsale della rete. Offre elevati livelli di sicurezza, privacy e stabilità. Tuttavia, ha meno funzioni e richiede molto spazio e memoria." + walletbitcoincore: "Bitcoin Core è un client Bitcoin completo e costruisce la spina dorsale della rete. Offre elevati livelli di sicurezza, privacy e stabilità. Tuttavia, ha meno funzioni e richiede molto spazio e memoria." walletmultibit: "MultiBit è un client leggero, veloce e facile da usare. Si sincronizza con la rete ed è pronto all'uso in un pochi minuti. MultiBit supporta anche molte lingue. È una buona scelta per gli utenti non tecnici." walletarmory: "Armory è un client per Bitcoin avanzato che ne espande le funzioni per gli utenti esperti. Offre diverse funzionalità di backup e criptaggio e permette una sicura archiviazione su computer non in linea." walletelectrum: "Electrum punta a velocità e semplicità, con un basso impiego di risorse. Utilizza dei server remoti che gestiscono le parti più complicate del sistema Bitcoin, e permette il recupero del proprio portafoglio con una frase segreta." diff --git a/_translations/ja.yml b/_translations/ja.yml index a549e48b..fac3851e 100644 --- a/_translations/ja.yml +++ b/_translations/ja.yml @@ -105,7 +105,7 @@ ja: walletcatdesktop: "デスクトップ" walletcathardware: "ハードウェア" walletcatweb: "ウェブ" - walletbitcoinqt: "ビットコイン・コアは完全なビットコイン・クライアントであり、ネットワークのバックボーンを構築します。最高レベルの安全性、匿名性、安定性を提供しますが、機能が少なく、多くのディスク容量とメモリが必要となります。" + walletbitcoincore: "ビットコイン・コアは完全なビットコイン・クライアントであり、ネットワークのバックボーンを構築します。最高レベルの安全性、匿名性、安定性を提供しますが、機能が少なく、多くのディスク容量とメモリが必要となります。" walletmultibit: "マルチビット(MultiBit)は、軽量クライアントで、高速で容易に使えることが重視されています。数分でネットワークと同期し使い始められます。また、マルチビットは多くの言語に対応しており、一般ユーザにお勧めです。" walletarmory: "アーモリー(Armory)は、ビットコイン・パワーユーザーのための機能を拡張できる高度なビットコイン・クライアントです。数多くのバックアップと暗号化機能を提供し、オフライン・コンピューターのコールド・ストレージを安全に保管します。" walletelectrum: "エレクトラム(Electrum)は、少ないリソースの使用で、高速度と単純性を達成することにフォーカスをあてています。ビットコインシステムの最も複雑な部分を扱うリモート・サーバを使用しており、秘密のフレーズを使って、あなたのビットコイン・ウォレットを回収することができます。" diff --git a/_translations/ko.yml b/_translations/ko.yml index 19e79f9b..140e9daa 100644 --- a/_translations/ko.yml +++ b/_translations/ko.yml @@ -105,7 +105,7 @@ ko: walletcatdesktop: "데스크탑" walletcathardware: "하드웨어" walletcatweb: "웹" - walletbitcoinqt: "비트코인 코어는 풀 비트코인 사용자로서 네트워크의 중추적 역할을 구축합니다. 비트코인 코어는 보안, 개인정보보호 및 안전을 제공합니다. 하지만, 비트코인 코어는 기능이 한정되어 있으며 많은 용량과 메모리를 필요로 합니다." + walletbitcoincore: "비트코인 코어는 풀 비트코인 사용자로서 네트워크의 중추적 역할을 구축합니다. 비트코인 코어는 보안, 개인정보보호 및 안전을 제공합니다. 하지만, 비트코인 코어는 기능이 한정되어 있으며 많은 용량과 메모리를 필요로 합니다." walletmultibit: "MultiBit는 사용의 용이함과 속도에 초점을 둔 라이트웨이트 클라이언트입니다. 몇분내로 네트워크와 동기화하고 사용할 수 있습니다. 또한 MultiBit은 다양한 언어를 지원합니다. 비전문의 사용자들에게 좋습니다." walletarmory: "Armory는 파워유저들을 위해 향상된 기능을 제공하는 고급 클라이언트입니다. 많은 백업과 인크립션 기능들을 제공하며, 오프라인 컴퓨터를 이용한 콜드 스토리지가 가능합니다." walletelectrum: "Electrum의 초점은 적은 자원소모, 간편함, 그리고 속도입니다. 원격 서버들을 이용해 비트코인의 가장 복잡한 부분들을 관리하며 비밀구절을 사용하여 당신의 지갑을 복구할 수 있게 해주는 기능을 제공합니다." diff --git a/_translations/nl.yml b/_translations/nl.yml index a42446c7..d787bcf1 100644 --- a/_translations/nl.yml +++ b/_translations/nl.yml @@ -105,7 +105,7 @@ nl: walletcatdesktop: "Desktop" walletcathardware: "Hardware" walletcatweb: "Web" - walletbitcoinqt: "Bitcoin Core is een volledige Bitcoin-client en vormt de ruggengraat van het netwerk. Het biedt een hoog niveau van bescherming, privacy en stabiliteit. Het heeft echter minder functies en vereist veel opslagruimte en geheugen." + walletbitcoincore: "Bitcoin Core is een volledige Bitcoin-client en vormt de ruggengraat van het netwerk. Het biedt een hoog niveau van bescherming, privacy en stabiliteit. Het heeft echter minder functies en vereist veel opslagruimte en geheugen." walletmultibit: "MultiBit is een lichte client die vooral gericht is op snelheid en gebruiksgemak. Het is binnen een paar minuten gesynchroniseerd met het netwerk en klaar voor gebruik. MultiBit ondersteunt bovendien veel verschillende talen. Het is een goede keus voor gebruikers die niet technisch onderlegd zijn." walletarmory: "Armory is een geavanceerde Bitcoin-client die de functies voor Bitcoin-powerusers uitbreidt. Het biedt verschillende back-up- en encryptiemogelijkheden en beveiligde cold-storage op offline computers." walletelectrum: "Electrum is gericht op snelheid en eenvoud en is zeer licht voor uw computer. Het laat de ingewikkeldere taken van het Bitcoin-systeem uitvoeren door servers elders en het biedt de mogelijkheid om uw portemonnee terug te vinden met behulp van een geheime zin." diff --git a/_translations/pl.yml b/_translations/pl.yml index 9c683f92..90a42404 100644 --- a/_translations/pl.yml +++ b/_translations/pl.yml @@ -105,7 +105,7 @@ pl: walletcatdesktop: "Komputery" walletcathardware: "Sprzęt" walletcatweb: "Sieć" - walletbitcoinqt: "Bitcoin Core to kompletny klient Bitcoin, który stanowi kręgosłup sieci. Oferuje on wysoki poziom bezpieczeństwa, prywatności oraz stabilności. Jednakże posiada mniejszą ilość funkcji oraz zajmuje o wiele więcej miejsca i pamięci." + walletbitcoincore: "Bitcoin Core to kompletny klient Bitcoin, który stanowi kręgosłup sieci. Oferuje on wysoki poziom bezpieczeństwa, prywatności oraz stabilności. Jednakże posiada mniejszą ilość funkcji oraz zajmuje o wiele więcej miejsca i pamięci." walletmultibit: "MultiBit jest niewielką aplikacją, która koncentruje się na szybkości i łatwości obsługi. Synchronizuje się z siecią i jest gotowa do użycia w minuty. MultiBit obsługuje również wiele języków. Jest to dobry wybór dla użytkowników, którzy nie czują się zbyt pewnie w kwestiach technicznych." walletarmory: "Armory jest zaawansowanym klientem Bitcoin, który daje szersze możliwości zaawansowanym użytkownikom. Oferuje wiele funkcji kopii zapasowych i szyfrowania oraz umożliwia bezpieczne przechowywanie \"cold-storage\", na komputerach niepodłączonych do sieci." walletelectrum: "Electrum koncentruje się na szybkości oraz prostocie przy niewielkim użyciu zasobów. Wykorzystuje on zdalne serwery, które wykonują najbardziej skomplikowane zadania systemu Bitcoin, oraz pozwala Ci na odtworzenie twojego portfela przy użyciu hasła." diff --git a/_translations/pt_BR.yml b/_translations/pt_BR.yml index 9c0205f1..36ac8f48 100644 --- a/_translations/pt_BR.yml +++ b/_translations/pt_BR.yml @@ -105,7 +105,7 @@ pt_BR: walletcatdesktop: "Computadores" walletcathardware: "Hardware" walletcatweb: "Web" - walletbitcoinqt: "Bitcoin Core é um cliente Bitcoin completo que forma a espinha dorsal da rede. Ele ofereçe segurança de alto nível, privacidade e estabilidade. No entanto ele tem poucas características além de consumir bastante espaço e memória." + walletbitcoincore: "Bitcoin Core é um cliente Bitcoin completo que forma a espinha dorsal da rede. Ele ofereçe segurança de alto nível, privacidade e estabilidade. No entanto ele tem poucas características além de consumir bastante espaço e memória." walletmultibit: "MultiBit é um cliente Bitcoin leve focado na rapidez e fácil utilização. A sincronização com a rede ocorre em minutos e em seguida está pronto para ser usado. O MultiBit também suporta diversos idiomas. É uma boa escolha para usuários leigos e não técnicos." walletarmory: "Armory é um cliente avançado de Bitcoin que expande as suas caraterísticas para usuários de Bitcoin mais avançados. Ele oferece muitas características de proteção e de encriptação, e permite um armazenamento a frio seguro em computadores offline." walletelectrum: "A principal característica do Electrum é a rapidez e simplicidade, com baixo uso de recursos. Ele utiliza servidores remotos, responsáveis pela parte mais complicada do funcionamento do Bitcoin, e permite recuperar sua carteira a partir de sua senha pessoal." diff --git a/_translations/ro.yml b/_translations/ro.yml index 6aca73c7..6d426b72 100644 --- a/_translations/ro.yml +++ b/_translations/ro.yml @@ -105,7 +105,7 @@ ro: walletcatdesktop: "Desktop" walletcathardware: "Hardware" walletcatweb: "Web" - walletbitcoinqt: "Bitcoin Core este un client Bitcoin complet şi reprezintă coloana vertebrală a reţelei. Oferă un nivel înalt de securitate, confidenţialitate şi stabilitate. Pe de altă parte, are mai puţine servicii adiţionale şi ocupă mai mult spaţiu şi memorie." + walletbitcoincore: "Bitcoin Core este un client Bitcoin complet şi reprezintă coloana vertebrală a reţelei. Oferă un nivel înalt de securitate, confidenţialitate şi stabilitate. Pe de altă parte, are mai puţine servicii adiţionale şi ocupă mai mult spaţiu şi memorie." walletmultibit: "MultiBit este un client uşor ce se axează pe rapidatate şi uşurinţă în utilizare. Se sincronizează cu reţeaua şi este gata de utilizare în câteva minute. MultiBit de asemenea este tradus în multe limbi. Este o alegere bună pentru utilizatori obişnuiţi." walletarmory: "Armory este un client Bitcoin avansat, ce are capabilităţi extinse, fiind orientat către utilizatorii Bitcoin avansaţi. Oferă multe opţiuni de backup şi de criptare şi oferă stocare la rece sigură pe calculatoare neconectate la Internet." walletelectrum: "Electrum se bazează pe rapiditate şi simplitate, consumând puţine resurse. Foloseşte servere la distanţă ce se ocupă de majoritatea părţilor complicate ale sistemului Bitcoin şi îţi permit să-ţi recuperezi portofelul folosind o frază secretă." diff --git a/_translations/ru.yml b/_translations/ru.yml index 21edbe4f..b228cf16 100644 --- a/_translations/ru.yml +++ b/_translations/ru.yml @@ -105,7 +105,7 @@ ru: walletcatdesktop: "Компьютер" walletcathardware: "Устройство" walletcatweb: "Веб" - walletbitcoinqt: "Bitcoin Core - это полноценный клиент, составляющий основу сети. Для него характерен высокий уровень безопасности, конфиденциальности и стабильности. Однако, у него меньше опций и он занимает довольно много места на диске и оперативной памяти." + walletbitcoincore: "Bitcoin Core - это полноценный клиент, составляющий основу сети. Для него характерен высокий уровень безопасности, конфиденциальности и стабильности. Однако, у него меньше опций и он занимает довольно много места на диске и оперативной памяти." walletmultibit: "MultiBit - это легковесный клиент, главное преимущество которого - он быстр и прост в использовании. Синхронизация с сетью и подготовка к использованию происходит в течение нескольких минут." walletarmory: "Armory это продвинутый биткойн-клиент, который расширяет функционал для продвинутых биткойн-пользователей. Он предлагает много функций по шифрованию и созданию резервных копий, а также позволяет использование безопасного оффлайн-хранения на отключенных от сети компьютерах." walletelectrum: "Electrum быстр и прост в использовании и требует мало ресурсов. Использует удаленные сервера, которые обрабатывают наиболее сложные операции, позволяет вам восстановить кошелек с помощью пароля." diff --git a/_translations/sl.yml b/_translations/sl.yml index 85d95819..a97ee7d1 100644 --- a/_translations/sl.yml +++ b/_translations/sl.yml @@ -105,7 +105,7 @@ sl: walletcatdesktop: "Namizne" walletcathardware: "Strojne" walletcatweb: "Spletne" - walletbitcoinqt: "Bitcoin Core je poln odjemalec za bitcoin in tvori hrbtenico omrežja bitcoin. Nudi visoko stopnjo varnosti, zasebnosti in stabilnosti. Ima pa manj uporabniških funkcij in visoko porabo pomnilnika ter prostora za hrambo podatkov." + walletbitcoincore: "Bitcoin Core je poln odjemalec za bitcoin in tvori hrbtenico omrežja bitcoin. Nudi visoko stopnjo varnosti, zasebnosti in stabilnosti. Ima pa manj uporabniških funkcij in visoko porabo pomnilnika ter prostora za hrambo podatkov." walletmultibit: "MultiBit je lahek odjemalec s poudarkom na hitrosti in enostavnosti uporabe. V nekaj sekundah ali minutah po namestitvi se uskladi z omrežjem in je pripravljen za uporabo. Podpira tudi mnogo jezikov, med drugim slovenščino. MultiBit je dobra izbira za tehnično manj podkovane uporabnike." walletarmory: "Armory je napreden odjemalec za bitcoin z mnogimi funkcijami za naprednejše uporabnike, kot so različne možnosti izdelave rezervnih kopij in šifriranja ter varno \"hladno hranjenje\" novcev na sistemih brez povezave." walletelectrum: "Electrum se osredotoča na hitrost in enostavnost ter nizko porabo virov na računalniku. Za najbolj zapletena opravila uporablja oddaljene strežnike. Omogoča restavriranje denarnice iz skrivnega stavka (semena)." diff --git a/_translations/sv.yml b/_translations/sv.yml index 31e7624a..99e86a5b 100644 --- a/_translations/sv.yml +++ b/_translations/sv.yml @@ -112,7 +112,7 @@ sv: walletcatdesktop: "Dator" walletcathardware: "Hårdvara" walletcatweb: "Webben" - walletbitcoinqt: "Bitcoin Core är en full Bitcoin klient och är en del utav ryggraden i nätverket. Den erbjuder en hög nivå utav säkerhet, integritet och stabilitet. Den här däremot lite färre funktioner och tar upp mycket plats i minnet och på hårddisken." + walletbitcoincore: "Bitcoin Core är en full Bitcoin klient och är en del utav ryggraden i nätverket. Den erbjuder en hög nivå utav säkerhet, integritet och stabilitet. Den här däremot lite färre funktioner och tar upp mycket plats i minnet och på hårddisken." walletmultibit: "MultiBit är en enkel klient med fokus på att vara snabb och enkel att använda. Den synkroniserar med nätet och är klar att användas på några minuter. MultiBit har stöd för många språk. Ett bra val för icke-tekniska användare." walletarmory: "Armory är en avancerad Bitcoin-klient som har ett fler funktioner för avancerade Bitcoin användare. Den erbjuder många backup och krypterings funktioner och och stödjer säker offline lagring." walletelectrum: "Electrum's fokus är snabbhet och enkelhet med lågt resursanvändande. Den använder externa datorer för de mest komplicerade delarna av Bitcoin-systemet och tillåter dig att få tillbaka en plånbok genom att ange en hemlig lösenordsfras." diff --git a/_translations/tr.yml b/_translations/tr.yml index e3b2ccc9..01a9dd41 100644 --- a/_translations/tr.yml +++ b/_translations/tr.yml @@ -105,7 +105,7 @@ tr: walletcatdesktop: "Masaüstü" walletcathardware: "Donanım" walletcatweb: "Web" - walletbitcoinqt: "Bitcoin Core tam bir Bitcoin istemcidir ve ağ'ın bel kemiğini oluşturmaktadır. Yüksek seviyede güvenlik, gizlilik ve stabilite sunar. Ancak az sayıda özelliğe sahiptir ve yüksek miktarda boş alan ve hafıza kullanıyor." + walletbitcoincore: "Bitcoin Core tam bir Bitcoin istemcidir ve ağ'ın bel kemiğini oluşturmaktadır. Yüksek seviyede güvenlik, gizlilik ve stabilite sunar. Ancak az sayıda özelliğe sahiptir ve yüksek miktarda boş alan ve hafıza kullanıyor." walletmultibit: "MultiBit hızlı ve kullanılması kolay olan hafif bir istemcidir. Ağla senkronize olup kullanılmaya hazır olması sadece birkaç dakika sürer. Ayrıca birçok dili destekler. Teknik detaylarla uğraşmak istemeyen kullanıcılar için iyi bir seçimdir." walletarmory: "Armory, Bitcoin kullanıcıları için özellikleri arttırılmış, gelişmiş bir Bitcoin istemcisidir. Bir çok yedekleme ve şifreleme özelliği içerir ve çevrimdışı bilgisayarlarda yedeklemeyi güvenli kılar." walletelectrum: "Electrum, daha az kaynak kullanarak, hız ve basitliğe önem verir. Bitcoin sisteminin en karışık kısımlarını halleden uzak bilgisayarları kullanır ve cüzdanınızı gizli bir şifreyle kurtarmanızı sağlar." diff --git a/_translations/uk.yml b/_translations/uk.yml index df35d7f6..73d25f4f 100644 --- a/_translations/uk.yml +++ b/_translations/uk.yml @@ -105,7 +105,7 @@ uk: walletcatdesktop: "Комп'ютер" walletcathardware: "Пристрої" walletcatweb: "Веб" - walletbitcoinqt: "Bitcoin Core - це повноцінний клієнт, що лежить в основі мережі. Він пропонує високий рівень безпеки, конфіденційності та стабільності. Проте, у нього менше опцій і він займає досить багато місця на диску і в оперативній пам'яті." + walletbitcoincore: "Bitcoin Core - це повноцінний клієнт, що лежить в основі мережі. Він пропонує високий рівень безпеки, конфіденційності та стабільності. Проте, у нього менше опцій і він займає досить багато місця на диску і в оперативній пам'яті." walletmultibit: "MultiBit - це легкий клієнт, головна перевага якого - швидкість та легкість у використанні. Його синхронізація з мережею та підготовка до використання відбувається протягом декількох хвилин. MultiBit доступний багатьма мовами. Це гарний вибір для нетехнічних користувачів." walletarmory: "Armory - це біткойн-клієнт з розширеним функціоналом для досвідчених біткойн-користувачів. Він містить багато функцій з шифрування та створення резервних копій, а також дозволяє використання безпечного офлайн-зберігання на від'єднаних від мережі комп'ютерах. " walletelectrum: "Electrum - це швидкий та легкий у використанні гаманець, що не потребує багато ресурсів. Він використовує віддалені сервери, що опрацьовують найскладніші операції біткойн-системи. Він також дозволяє вам відновити гаманець за допомогою секретної фрази." diff --git a/_translations/zh_CN.yml b/_translations/zh_CN.yml index ba5ad3cb..1d11e968 100644 --- a/_translations/zh_CN.yml +++ b/_translations/zh_CN.yml @@ -105,7 +105,7 @@ zh_CN: walletcatdesktop: "桌面" walletcathardware: "硬件" walletcatweb: "网页" - walletbitcoinqt: "Bitcoin Core是完整的比特币客户端。它构建了比特币的主干网络。它具有高度的安全性、隐私性、稳定性。然而,相比其它客户端,它的功能少一些,还需要占用大量的存储空间和内存。" + walletbitcoincore: "Bitcoin Core是完整的比特币客户端。它构建了比特币的主干网络。它具有高度的安全性、隐私性、稳定性。然而,相比其它客户端,它的功能少一些,还需要占用大量的存储空间和内存。" walletmultibit: "MultiBit属于轻量级客户端,专注于快捷和易用。MultiBit几分钟内就可以完成网络同步投入使用;同时也支持多种语言,对于非技术用户来说,是一个不错的选择。" walletarmory: "Armory 是一款高级比特币客户端,为比特币资深用户做了更多性能扩展。它提供了很多的备份和加密功能,允许安全的线下冷存储方式。" walletelectrum: "Electrum客户端的侧重点是快速,简单,占用资源少。它使用远程服务器来处理比特币系统中最复杂的部分,你还可以通过一个预设的保密短语用来还原你的钱包。" diff --git a/_translations/zh_TW.yml b/_translations/zh_TW.yml index a24e5e94..8bc16ca5 100644 --- a/_translations/zh_TW.yml +++ b/_translations/zh_TW.yml @@ -105,7 +105,7 @@ zh_TW: walletcatdesktop: "桌面" walletcathardware: "硬體" walletcatweb: "網頁" - walletbitcoinqt: "Bitcoin Core 是原生 Bitcoin 客戶端,也是整個網路的骨幹。它提供最高等級的安全性、隱密性及穩定性。但是它的功能較少,也需要許多空間和記憶體。" + walletbitcoincore: "Bitcoin Core 是原生 Bitcoin 客戶端,也是整個網路的骨幹。它提供最高等級的安全性、隱密性及穩定性。但是它的功能較少,也需要許多空間和記憶體。" walletmultibit: "MultiBit 是一個輕量級的客戶端,著重在快速與容易上手。它會與網路同步,幾分鐘內就可以使用。它也支援多種語言。MultiBit 是非技術背景使用者的好選擇。" walletarmory: "Armory 是一個先進的 Bitcoin 客戶端,它給 Bitcoin 的高級用戶擴充了很多功能。它提供多種備份與加密功能,也允許將冷資料儲存放在離線的電腦上以保障安全。" walletelectrum: "Electrum 注重速度和簡單性,只佔用少量的資源。它將 Bitcoin 系統裡最複雜的計算留給遠端伺服器執行,也讓使用者可透過密語來還原錢包。" From d02f38830996ef54f84424ae91e52f60ff9ed98a Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Tue, 18 Jul 2017 00:20:51 +0200 Subject: [PATCH 15/37] Adds button and click handler to display a specifi distro --- _includes/layout/base/wallets-list.html | 2 +- _layouts/wallet-container.html | 2 +- _sass/_wallets.scss | 18 ++++++++++++++ js/main.js | 33 +++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/_includes/layout/base/wallets-list.html b/_includes/layout/base/wallets-list.html index b27d19c3..ce9d01f5 100644 --- a/_includes/layout/base/wallets-list.html +++ b/_includes/layout/base/wallets-list.html @@ -8,7 +8,7 @@ http://opensource.org/licenses/MIT.
{% for wallet in site.wallets %}
- + {{ wallet.title }} {{ wallet.titleshort }} diff --git a/_layouts/wallet-container.html b/_layouts/wallet-container.html index 9ee7c375..f5e6f2e9 100644 --- a/_layouts/wallet-container.html +++ b/_layouts/wallet-container.html @@ -22,7 +22,7 @@ layout: wallet-platform-container
{% for platform in page.platform %} {% for os in platform.os %} - + {% endfor %} {% endfor %}
+ {% assign platform = page.platform %} + {% assign os = page.os %}
- {% for platform in page.platform %} - {% for os in platform.os %}
@@ -84,16 +89,7 @@ layout: wallet-platform-container screenshot
- {% endfor %} - {% endfor %}
-
diff --git a/_sass/_wallets.scss b/_sass/_wallets.scss index 3b46cc16..48b6dadc 100644 --- a/_sass/_wallets.scss +++ b/_sass/_wallets.scss @@ -271,7 +271,7 @@ $scores: text-align: center; margin-bottom: 20px; - button { + .wallet-os-btn { background-color: transparent; font-weight: bold; border: 1px solid #255f96; From d2064718094a290f7a318cafd29bc42e542ceed8 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Tue, 18 Jul 2017 15:21:36 +0200 Subject: [PATCH 20/37] Updating choose-your-wallet. Adds wallets page generator with translations. --- _layouts/wallet-container.html | 1 + _plugins/wallets.rb | 43 +++++++++-- _templates/choose-your-wallet.html | 110 ++--------------------------- 3 files changed, 46 insertions(+), 108 deletions(-) diff --git a/_layouts/wallet-container.html b/_layouts/wallet-container.html index 1da4069c..4ec055dd 100644 --- a/_layouts/wallet-container.html +++ b/_layouts/wallet-container.html @@ -3,6 +3,7 @@ # http://opensource.org/licenses/MIT. layout: wallet-platform-container +max_wallet_text_length: 418 ## Unicode characters ---
diff --git a/_plugins/wallets.rb b/_plugins/wallets.rb index 292b7942..515ca1d8 100644 --- a/_plugins/wallets.rb +++ b/_plugins/wallets.rb @@ -6,7 +6,7 @@ require 'yaml' module Jekyll class WalletPage < Page - def initialize(site, base, dir, wallet, platform, os) + def initialize(site, base, dir, wallet, platform, os, lang) @site = site @base = base @dir = dir @@ -18,6 +18,7 @@ module Jekyll self.data['platform'] = platform self.data['os'] = os self.data['id'] = ['wallets', platform['name'], os['name'], wallet['id']].join('-') + self.data['lang'] = lang end end @@ -25,27 +26,61 @@ module Jekyll safe true def generate(site) + # Get the collection of wallets from _wallets walletsCol = site.collections['wallets']; + + # Output dir + # TODO: Make this configurable and "translatable" walletsDir = 'wallets' + # Loading translations. + # Copy-paste from _plugins/templates.rb + locs = {} + enabled = ENV['ENABLED_LANGS']; + enabled = enabled.split(' ') if !enabled.nil? + Dir.foreach('_translations') do |file| + next if file == '.' or file == '..' or file == 'COPYING' + lang = file.split('.')[0] + # Ignore language if it's disabled + if lang != 'en' and !enabled.nil? and !enabled.include?(lang) + puts('Lang ' + lang + ' disabled') + next + end + locs[lang] = YAML.load_file("_translations/"+file)[lang] + end + + puts('----- Generating wallet pages -----') + + # Getting information about each found wallet walletsCol.docs.each do |doc| file = doc.path wallet = YAML.load_file(file) walletPlatforms = wallet['platform'] - puts('---------------------') - puts(wallet['id']) + puts(wallet['id'] + ' is loaded. Generating pages...') + # Going through all available combinations of + # platforms and OSes walletPlatforms.each do |platform| platform['os'].each do |os| + + # This allows generation only of valid wallet pages if platform['name'] + + locs.each do |lang,value| dir = File.join(platform['name'], os['name'], wallet['id']) - site.pages << WalletPage.new(site, site.source, File.join('en', walletsDir, dir), wallet, platform, os) + site.pages << WalletPage.new(site, site.source, File.join(lang, walletsDir, dir), wallet, platform, os, lang) + end end + end end + + puts(wallet['id'] + ' is processed.') end + puts('----- Wallet pages generated -----') + end end diff --git a/_templates/choose-your-wallet.html b/_templates/choose-your-wallet.html index 076663e2..6e2fc766 100755 --- a/_templates/choose-your-wallet.html +++ b/_templates/choose-your-wallet.html @@ -5,109 +5,11 @@ # Definitions for the property checks below can be found here: # https://github.com/bitcoin-dot-org/bitcoin.org/blob/master/_translations/en.yml -layout: base +layout: wallet-platform id: choose-your-wallet -max_wallet_text_length: 418 ## Unicode characters + +platform: + name: desktop +os: + name: windows --- - - - -

{% translate pagetitle %}

-

{% translate pagedesc %}

- - - -
-{% for wallet in site.wallets %}{% for wallet in wallet %}{% if wallet[1].platform.mobile %}{% assign platform = wallet[1].platform.mobile %}{% elsif wallet[1].platform.desktop %}{% assign platform = wallet[1].platform.desktop %}{% elsif wallet[1].platform.hardware %}{% assign platform = wallet[1].platform.hardware %}{% else %}{% assign platform = wallet[1].platform.web %}{% endif %} -
- -
-

{{ wallet[1].title }}

-
{% for os in platform.os %}{% translate platform{{os}} %}{% unless wallet[1].compat contains os %}{% die platform not listed in compat field %}{% endunless %}{% endfor %}
-
{% if platform.link == 'bitcoincore' %}{% translate walletdownload %}{% elsif platform.link contains 'play.google.com' or platform.link contains 'itunes.apple.com' or platform.link contains 'chrome.google.com' %}{% translate walletdownload %}{% else %}{% translate walletvisit %}{% endif %}{% if platform.source %}{% translate walletsourcecode %}{% endif %}
-
- {% for check in platform.check %}{% if check[0] == 'privacy' and platform.privacycheck %} -
{% translate {{check[1]}} %}
- {% for privacycheck in platform.privacycheck %} -
-

{% translate {{privacycheck[1]}} %}

-

{% translate {{privacycheck[1]}}txt %}

-
- {% endfor %} -
- {% else %} -
{% translate {{check[1]}} %}

{% translate {{check[1]}}txt %}

- {% endif %}{% endfor %} -
- {% capture platform_text %}{% translate {{platform.text}} %}{% endcapture %} - {% assign platform_text_length = platform_text | size %} -

{% if platform_text_length > page.max_wallet_text_length %}{% die Wallet text too long %}{% else %}{{platform_text}}{% endif %}

-
screenshot
-
- {{ wallet[1].title }}{{ wallet[1].titleshort }} -
-{% endfor %}{% endfor %} -
- -
-{% for wallet in page.wallets %}{% for wallet in wallet %}{% for platform in wallet[1].platform %} -
- -
-

{{ wallet[1].title }}

-
{% for os in platform[1].os %}{% translate platform{{os}} %}{% endfor %}
-
{% if platform[1].link == 'bitcoincore' %}{% translate walletdownload %}{% elsif platform[1].link contains 'play.google.com' or platform[1].link contains 'itunes.apple.com' or platform[1].link contains 'chrome.google.com' %}{% translate walletdownload %}{% else %}{% translate walletvisit %}{% endif %}{% if platform[1].source %}{% translate walletsourcecode %}{% endif %}
-
- {% for check in platform[1].check %}{% if check[0] == 'privacy' and platform[1].privacycheck %} -
{% translate {{check[1]}} %}
- {% for privacycheck in platform[1].privacycheck %} -
-

{% translate {{privacycheck[1]}} %}

-

{% translate {{privacycheck[1]}}txt %}

-
- {% endfor %} -
- {% else %} -
{% translate {{check[1]}} %}

{% translate {{check[1]}}txt %}

- {% endif %}{% endfor %} -
- {% capture platform_text %}{% translate {{platform[1].text}} %}{% endcapture %} - {% assign platform_text_length = platform_text | size %} -

{% if platform_text_length > page.max_wallet_text_length %}{% die Wallet text too long %}{% else %}{{platform_text}}{% endif %}

-
screenshot
-
- {{ wallet[1].title }}{{ wallet[1].titleshort }} -
-{% endfor %}{% endfor %}{% endfor %} -
- -
- - - -
-

warning{% translate educate %}

-

{% translate educatetxt %}

-
From 2fb9b4d1366818df0bbffd88bb43ec34d3d6765e Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Tue, 18 Jul 2017 17:30:34 +0200 Subject: [PATCH 21/37] Refactoring wallets data format to make it easier to process --- _wallets/airbitzwallet.md | 89 +++++++---------- _wallets/arcbit.md | 131 +++++++++++-------------- _wallets/armory.md | 43 ++++---- _wallets/bitcoincore.md | 43 ++++---- _wallets/bitcoinknots.md | 43 ++++---- _wallets/bitcoinwallet.md | 93 +++++++----------- _wallets/bitgo.md | 76 ++++++++------- _wallets/bither.md | 130 +++++++++++-------------- _wallets/breadwallet.md | 88 +++++++---------- _wallets/btc.com.md | 122 ++++++++++------------- _wallets/coinapult.md | 30 +++--- _wallets/coinbase.md | 30 +++--- _wallets/coinspace.md | 157 +++++++++++++----------------- _wallets/copay.md | 86 ++++++++-------- _wallets/digitalbitbox.md | 27 +++--- _wallets/electrum.md | 78 ++++++++------- _wallets/greenaddress.md | 167 +++++++++++++++----------------- _wallets/greenbits.md | 35 +++---- _wallets/keepkey.md | 27 +++--- _wallets/ledgernano.md | 27 +++--- _wallets/ledgernanos.md | 27 +++--- _wallets/msigna.md | 43 ++++---- _wallets/mycelium.md | 35 +++---- _wallets/simplebitcoinwallet.md | 53 ++++------ _wallets/trezor.md | 27 +++--- _wallets/xapo.md | 30 +++--- 26 files changed, 822 insertions(+), 915 deletions(-) diff --git a/_wallets/airbitzwallet.md b/_wallets/airbitzwallet.md index 28f5904f..45e11b5c 100644 --- a/_wallets/airbitzwallet.md +++ b/_wallets/airbitzwallet.md @@ -4,61 +4,40 @@ title: "Airbitz Bitcoin Wallet" titleshort: "Airbitz" compat: "mobile android ios" level: 3 - platform: - mobile: - text: "walletairbitzwallet" - link: "https://airbitz.co/bitcoin-wallet/" - source: "https://github.com/Airbitz" - screenshot: "airbitzwalletios.png" + - mobile: + name: mobile os: - - android - - ios - check: - control: "checkpasscontrolhybrid" - validation: "checkpassvalidationservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletairbitzwallet" - link: "https://play.google.com/store/apps/details?id=com.airbitz" - source: "https://github.com/Airbitz" - screenshot: "airbitzwalletandroid.png" - os: - - android - check: - control: "checkpasscontrolhybrid" - validation: "checkpassvalidationservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - ios: - text: "walletairbitzwallet" - link: "https://itunes.apple.com/us/app/bitcoin-wallet-map-directory/id843536046?mt=8" - source: "https://github.com/Airbitz" - screenshot: "airbitzwalletios.png" - os: - - ios - check: - control: "checkpasscontrolhybrid" - validation: "checkpassvalidationservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" + - name: android + text: "walletairbitzwallet" + link: "https://play.google.com/store/apps/details?id=com.airbitz" + source: "https://github.com/Airbitz" + screenshot: "airbitzwalletandroid.png" + check: + control: "checkpasscontrolhybrid" + validation: "checkpassvalidationservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + - name: ios + text: "walletairbitzwallet" + link: "https://itunes.apple.com/us/app/bitcoin-wallet-map-directory/id843536046?mt=8" + source: "https://github.com/Airbitz" + screenshot: "airbitzwalletios.png" + check: + control: "checkpasscontrolhybrid" + validation: "checkpassvalidationservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" --- diff --git a/_wallets/arcbit.md b/_wallets/arcbit.md index 1959ab16..3afef038 100644 --- a/_wallets/arcbit.md +++ b/_wallets/arcbit.md @@ -5,79 +5,64 @@ titleshort: "ArcBit" compat: "mobile desktop android ios windows mac linux" level: 3 platform: - mobile: - text: "walletarcbit" - link: "https://itunes.apple.com/app/arcbit-bitcoin-wallet/id999487888" - source: "https://github.com/arcbit/arcbit-ios" - screenshot: "arcbitios.png" + - desktop: + name: desktop + default: &DEFAULT + text: "walletarcbit" + link: "https://chrome.google.com/webstore/detail/arcbit-bitcoin-wallet/dkceiphcnbfahjbomhpdgjmphnpgogfk" + source: "https://github.com/arcbit/arcbit-web" + screenshot: "arcbitdesktop.png" + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkfailenvironmentdesktop" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroloverride" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkpassprivacynetworksupporttorproxy" os: - - ios - - android - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroloverride" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkfailprivacynetworknosupporttor" - desktop: - text: "walletarcbit" - link: "https://chrome.google.com/webstore/detail/arcbit-bitcoin-wallet/dkceiphcnbfahjbomhpdgjmphnpgogfk" - source: "https://github.com/arcbit/arcbit-web" - screenshot: "arcbitdesktop.png" + - name: windows + <<: *DEFAULT + - name: mac + <<: *DEFAULT + - name: linux + <<: *DEFAULT + - mobile: + name: mobile os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkfailenvironmentdesktop" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroloverride" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkpassprivacynetworksupporttorproxy" - ios: - text: "walletarcbit" - link: "https://itunes.apple.com/app/arcbit-bitcoin-wallet/id999487888" - source: "https://github.com/arcbit/arcbit-ios" - screenshot: "arcbitios.png" - os: - - ios - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroloverride" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletarcbit" - link: "https://play.google.com/store/apps/details?id=com.arcbit.arcbit" - source: "https://github.com/arcbit/arcbit-android" - screenshot: "arcbitios.png" - os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroloverride" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkfailprivacynetworknosupporttor" + - name: ios + text: "walletarcbit" + link: "https://itunes.apple.com/app/arcbit-bitcoin-wallet/id999487888" + source: "https://github.com/arcbit/arcbit-ios" + screenshot: "arcbitios.png" + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroloverride" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkfailprivacynetworknosupporttor" + - name: android + text: "walletarcbit" + link: "https://play.google.com/store/apps/details?id=com.arcbit.arcbit" + source: "https://github.com/arcbit/arcbit-android" + screenshot: "arcbitios.png" + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroloverride" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkfailprivacynetworknosupporttor" --- diff --git a/_wallets/armory.md b/_wallets/armory.md index 951f8f68..d8fd5e89 100644 --- a/_wallets/armory.md +++ b/_wallets/armory.md @@ -5,24 +5,29 @@ titleshort: "Armory" compat: "desktop windows mac linux" level: 2 platform: - desktop: - text: "walletarmory" - link: "https://btcarmory.com/" - source: "https://github.com/goatpig/BitcoinArmory" - screenshot: "armory.png" + - desktop: + name: desktop + default: &DEFAULT + text: "walletarmory" + link: "https://btcarmory.com/" + source: "https://github.com/goatpig/BitcoinArmory" + screenshot: "armory.png" + check: + control: "checkgoodcontrolfull" + validation: "checkgoodvalidationfullnoderequired" + transparency: "checkpasstransparencyopensource" + environment: "checkfailenvironmentdesktop" + privacy: "checkgoodprivacyimproved" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkpassprivacydisclosurefullnode" + privacynetwork: "checkpassprivacynetworksupporttorproxy" os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkgoodvalidationfullnoderequired" - transparency: "checkpasstransparencyopensource" - environment: "checkfailenvironmentdesktop" - privacy: "checkgoodprivacyimproved" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkpassprivacydisclosurefullnode" - privacynetwork: "checkpassprivacynetworksupporttorproxy" + - name: windows + <<: *DEFAULT + - name: mac + <<: *DEFAULT + - name: linux + <<: *DEFAULT --- diff --git a/_wallets/bitcoincore.md b/_wallets/bitcoincore.md index 2d51e6bb..9e6806cf 100644 --- a/_wallets/bitcoincore.md +++ b/_wallets/bitcoincore.md @@ -5,24 +5,29 @@ titleshort: "Bitcoin
Core" compat: "desktop windows mac linux" level: 1 platform: - desktop: - text: "walletbitcoinqt" - link: "bitcoincore" - source: "https://github.com/bitcoin/bitcoin" - screenshot: "bitcoincore.png" + - desktop: + name: desktop + default: &DEFAULT + text: "walletbitcoincore" + link: "bitcoincore" + source: "https://github.com/bitcoin/bitcoin" + screenshot: "bitcoincore.png" + check: + control: "checkgoodcontrolfull" + validation: "checkgoodvalidationfullnode" + transparency: "checkgoodtransparencydeterministic" + environment: "checkfailenvironmentdesktop" + privacy: "checkgoodprivacyimproved" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkpassprivacydisclosurefullnode" + privacynetwork: "checkpassprivacynetworksupporttorproxy" os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkgoodvalidationfullnode" - transparency: "checkgoodtransparencydeterministic" - environment: "checkfailenvironmentdesktop" - privacy: "checkgoodprivacyimproved" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkpassprivacydisclosurefullnode" - privacynetwork: "checkpassprivacynetworksupporttorproxy" + - name: windows + <<: *DEFAULT + - name: mac + <<: *DEFAULT + - name: linux + <<: *DEFAULT --- diff --git a/_wallets/bitcoinknots.md b/_wallets/bitcoinknots.md index 11c982d1..a6086d78 100644 --- a/_wallets/bitcoinknots.md +++ b/_wallets/bitcoinknots.md @@ -5,24 +5,29 @@ titleshort: "Bitcoin
Knots" compat: "desktop windows mac linux" level: 1 platform: - desktop: - text: "walletbitcoinknots" - link: "https://bitcoinknots.org/" - source: "https://github.com/bitcoinknots/bitcoin/" - screenshot: "bitcoinknots.png" + - desktop: + name: desktop + default: &DEFAULT + text: "walletbitcoinknots" + link: "https://bitcoinknots.org/" + source: "https://github.com/bitcoinknots/bitcoin/" + screenshot: "bitcoinknots.png" + check: + control: "checkgoodcontrolfull" + validation: "checkgoodvalidationfullnode" + transparency: "checkgoodtransparencydeterministic" + environment: "checkfailenvironmentdesktop" + privacy: "checkgoodprivacyimproved" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkpassprivacydisclosurefullnode" + privacynetwork: "checkpassprivacynetworksupporttorproxy" os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkgoodvalidationfullnode" - transparency: "checkgoodtransparencydeterministic" - environment: "checkfailenvironmentdesktop" - privacy: "checkgoodprivacyimproved" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkpassprivacydisclosurefullnode" - privacynetwork: "checkpassprivacynetworksupporttorproxy" + - name: windows + <<: *DEFAULT + - name: mac + <<: *DEFAULT + - name: linux + <<: *DEFAULT --- diff --git a/_wallets/bitcoinwallet.md b/_wallets/bitcoinwallet.md index 3a7b2e74..74fff826 100644 --- a/_wallets/bitcoinwallet.md +++ b/_wallets/bitcoinwallet.md @@ -5,61 +5,42 @@ titleshort: "Bitcoin
Wallet" compat: "mobile android blackberry" level: 2 platform: - mobile: - text: "walletbitcoinwallet" - link: "https://play.google.com/store/apps/details?id=de.schildbach.wallet" - source: "https://github.com/bitcoin-wallet/bitcoin-wallet" - screenshot: "bitcoinwalletandroid.png" + - mobile: + name: mobile os: - - android - - blackberry - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletbitcoinwallet" - link: "https://play.google.com/store/apps/details?id=de.schildbach.wallet" - source: "https://github.com/bitcoin-wallet/bitcoin-wallet" - screenshot: "bitcoinwalletandroid.png" - os: - - android - - blackberry - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - blackberry: - text: "walletbitcoinwallet" - link: "https://appworld.blackberry.com/webstore/content/23952882/" - source: "https://github.com/bitcoin-wallet/bitcoin-wallet" - screenshot: "bitcoinwalletandroid.png" - os: - - android - - blackberry - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" + - name: android + text: "walletbitcoinwallet" + link: "https://play.google.com/store/apps/details?id=de.schildbach.wallet" + source: "https://github.com/bitcoin-wallet/bitcoin-wallet" + screenshot: "bitcoinwalletandroid.png" + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" + - name: blackberry + text: "walletbitcoinwallet" + link: "https://appworld.blackberry.com/webstore/content/23952882/" + source: "https://github.com/bitcoin-wallet/bitcoin-wallet" + screenshot: "bitcoinwalletandroid.png" + os: + - android + - blackberry + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" --- diff --git a/_wallets/bitgo.md b/_wallets/bitgo.md index 627fc04a..04018fa9 100644 --- a/_wallets/bitgo.md +++ b/_wallets/bitgo.md @@ -5,40 +5,48 @@ titleshort: "BitGo" compat: "web desktop windows mac linux" level: 3 platform: - desktop: - text: "walletbitgo" - link: "https://chrome.google.com/webstore/detail/bitgo/jlgeogaipkoajobchncghcojanffjfhl" - source: "https://github.com/BitGo/bitgo-chrome" - screenshot: "bitgo.png" + - desktop: + name: desktop + default: &DEFAULT + text: "walletbitgo" + link: "https://chrome.google.com/webstore/detail/bitgo/jlgeogaipkoajobchncghcojanffjfhl" + source: "https://github.com/BitGo/bitgo-chrome" + screenshot: "bitgo.png" + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" os: - - windows - - mac - - linux - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" - web: - text: "walletbitgo" - link: "https://www.bitgo.com/" - screenshot: "bitgo.png" + - name: windows + <<: *DEFAULT + - name: mac + <<: *DEFAULT + - name: linux + <<: *DEFAULT + - web: + name: web os: - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" + - name: web + text: "walletbitgo" + link: "https://www.bitgo.com/" + screenshot: "bitgo.png" + os: + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" --- diff --git a/_wallets/bither.md b/_wallets/bither.md index 9d6b22fa..e2d4fe94 100644 --- a/_wallets/bither.md +++ b/_wallets/bither.md @@ -5,78 +5,64 @@ titleshort: "Bither" compat: "mobile ios android desktop windows mac linux" level: 2 platform: - mobile: - text: "walletbither" - link: "https://itunes.apple.com/us/app/bither/id899478936" - source: "https://github.com/bither/bither-ios" - screenshot: "bithermobile.png" + - mobile: + name: mobile os: - - ios - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkfailprivacyweak" - fees: "checkfailfeecontrolstatic" - privacycheck: - privacyaddressreuse: "checkfailprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - ios: - text: "walletbither" - link: "https://itunes.apple.com/us/app/bither/id899478936" - source: "https://github.com/bither/bither-ios" - screenshot: "bithermobile.png" + - name: ios + text: "walletbither" + link: "https://itunes.apple.com/us/app/bither/id899478936" + source: "https://github.com/bither/bither-ios" + screenshot: "bithermobile.png" + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkfailprivacyweak" + fees: "checkfailfeecontrolstatic" + privacycheck: + privacyaddressreuse: "checkfailprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" + - name: android + text: "walletbither" + link: "https://play.google.com/store/apps/details?id=net.bither" + source: "https://github.com/bither/bither-android" + screenshot: "bithermobile.png" + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkfailprivacyweak" + fees: "checkfailfeecontrolstatic" + privacycheck: + privacyaddressreuse: "checkfailprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" + - desktop: + name: desktop + default: &DEFAULT + text: "walletbither" + link: "https://bither.net" + source: "https://github.com/bither/bither-desktop-java" + screenshot: "bitherdesktop.png" + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkfailenvironmentdesktop" + privacy: "checkfailprivacyweak" + fees: "checkfailfeecontrolstatic" + privacycheck: + privacyaddressreuse: "checkfailprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" os: - - ios - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkfailprivacyweak" - fees: "checkfailfeecontrolstatic" - privacycheck: - privacyaddressreuse: "checkfailprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletbither" - link: "https://play.google.com/store/apps/details?id=net.bither" - source: "https://github.com/bither/bither-android" - screenshot: "bithermobile.png" - os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkfailprivacyweak" - fees: "checkfailfeecontrolstatic" - privacycheck: - privacyaddressreuse: "checkfailprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - desktop: - text: "walletbither" - link: "https://bither.net" - source: "https://github.com/bither/bither-desktop-java" - screenshot: "bitherdesktop.png" - os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkfailenvironmentdesktop" - privacy: "checkfailprivacyweak" - fees: "checkfailfeecontrolstatic" - privacycheck: - privacyaddressreuse: "checkfailprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" + - name: windows + <<: *DEFAULT + - name: mac + <<: *DEFAULT + - name: linux + <<: *DEFAULT --- diff --git a/_wallets/breadwallet.md b/_wallets/breadwallet.md index 5c49bf24..8bb8826d 100644 --- a/_wallets/breadwallet.md +++ b/_wallets/breadwallet.md @@ -5,59 +5,39 @@ titleshort: "breadwallet" compat: "mobile android ios" level: 2 platform: - mobile: - text: "walletbreadwallet" - link: "https://itunes.apple.com/app/breadwallet/id885251393" - source: "https://github.com/voisine/breadwallet" - screenshot: "breadwallet.png" + - mobile: + name: mobile os: - - ios - - android - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - ios: - text: "walletbreadwallet" - link: "https://itunes.apple.com/app/breadwallet/id885251393" - source: "https://github.com/voisine/breadwallet" - screenshot: "breadwallet.png" - os: - - ios - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletbreadwallet" - link: "https://play.google.com/store/apps/details?id=com.breadwallet" - source: "https://github.com/breadwallet/breadwallet-android" - screenshot: "breadwallet.png" - os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" + - name: ios + text: "walletbreadwallet" + link: "https://itunes.apple.com/app/breadwallet/id885251393" + source: "https://github.com/voisine/breadwallet" + screenshot: "breadwallet.png" + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" + - name: android + text: "walletbreadwallet" + link: "https://play.google.com/store/apps/details?id=com.breadwallet" + source: "https://github.com/breadwallet/breadwallet-android" + screenshot: "breadwallet.png" + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" --- diff --git a/_wallets/btc.com.md b/_wallets/btc.com.md index aa20a74f..4f179336 100644 --- a/_wallets/btc.com.md +++ b/_wallets/btc.com.md @@ -5,76 +5,58 @@ titleshort: "BTC.com" compat: "mobile web android ios" level: 3 platform: - mobile: - text: "walletbtccom" - link: "https://play.google.com/store/apps/details?id=com.blocktrail.mywallet" - source: "https://github.com/blocktrail/blocktrail-wallet" - screenshot: "btccomwallet.png" + - mobile: + name: mobile os: - - android - - ios - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - web: - text: "walletbtccom" - link: "https://wallet.btc.com" - source: "https://github.com/blocktrail/blocktrail-webwallet" - screenshot: "btccomwallet.png" + - name: ios + text: "walletbtccom" + link: "https://itunes.apple.com/us/app/blocktrail-bitcoin-wallet/id1019614423" + source: "https://github.com/blocktrail/blocktrail-wallet" + screenshot: "btccomwallet.png" + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + - name: android + text: "walletbtccom" + link: "https://play.google.com/store/apps/details?id=com.blocktrail.mywallet" + source: "https://github.com/blocktrail/blocktrail-wallet" + screenshot: "btccomwallet.png" + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + - web: + name: web os: - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" - ios: - text: "walletbtccom" - link: "https://itunes.apple.com/us/app/blocktrail-bitcoin-wallet/id1019614423" - source: "https://github.com/blocktrail/blocktrail-wallet" - screenshot: "btccomwallet.png" - os: - - ios - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletbtccom" - link: "https://play.google.com/store/apps/details?id=com.blocktrail.mywallet" - source: "https://github.com/blocktrail/blocktrail-wallet" - screenshot: "btccomwallet.png" - os: - - android - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" + - name: web + text: "walletbtccom" + link: "https://wallet.btc.com" + source: "https://github.com/blocktrail/blocktrail-webwallet" + screenshot: "btccomwallet.png" + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" --- diff --git a/_wallets/coinapult.md b/_wallets/coinapult.md index 2e8bce64..f398a154 100644 --- a/_wallets/coinapult.md +++ b/_wallets/coinapult.md @@ -5,19 +5,21 @@ titleshort: "Coinapult" compat: "web" level: 4 platform: - web: - text: "walletcoinapult" - link: "https://coinapult.com/" - screenshot: "coinapult.png" + - web: + name: web os: - check: - control: "checkfailcontrolthirdparty" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkfailenvironmentdesktop" - privacy: "checkpassprivacybasic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" + - name: web + text: "walletcoinapult" + link: "https://coinapult.com/" + screenshot: "coinapult.png" + check: + control: "checkfailcontrolthirdparty" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkfailenvironmentdesktop" + privacy: "checkpassprivacybasic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" --- diff --git a/_wallets/coinbase.md b/_wallets/coinbase.md index 6d06ddd6..0c2f4cd2 100644 --- a/_wallets/coinbase.md +++ b/_wallets/coinbase.md @@ -5,19 +5,21 @@ titleshort: "Coinbase" compat: "web" level: 4 platform: - web: - text: "walletcoinbase" - link: "https://coinbase.com" - screenshot: "coinbase.png" + - web: + name: web os: - check: - control: "checkfailcontrolthirdparty" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkfailenvironmentdesktop" - privacy: "checkpassprivacybasic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" + - name: web + text: "walletcoinbase" + link: "https://coinbase.com" + screenshot: "coinbase.png" + check: + control: "checkfailcontrolthirdparty" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkfailenvironmentdesktop" + privacy: "checkpassprivacybasic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" --- diff --git a/_wallets/coinspace.md b/_wallets/coinspace.md index 419eb723..1acd3c09 100644 --- a/_wallets/coinspace.md +++ b/_wallets/coinspace.md @@ -5,95 +5,74 @@ titleshort: "Coin.Space" compat: "mobile web android windowsphone ios" level: 3 platform: - mobile: - text: "walletcoinspace" - link: "https://play.google.com/store/apps/details?id=com.coinspace.app" - source: "https://github.com/CoinSpace/CoinSpace" - screenshot: "coinspacemobile.png" + - mobile: + name: mobile os: - - android - - ios - - windowsphone - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencynew" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletcoinspace" - link: "https://play.google.com/store/apps/details?id=com.coinspace.app" - source: "https://github.com/CoinSpace/CoinSpace" - screenshot: "coinspacemobile.png" + - name: android + text: "walletcoinspace" + link: "https://play.google.com/store/apps/details?id=com.coinspace.app" + source: "https://github.com/CoinSpace/CoinSpace" + screenshot: "coinspacemobile.png" + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencynew" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + - name: ios + text: "walletcoinspace" + link: "https://itunes.apple.com/us/app/coinspace-bitcoin-wallet/id980719434?mt=8" + source: "https://github.com/CoinSpace/CoinSpace" + screenshot: "coinspacemobile.png" + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencynew" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + - name: windowsphone + text: "walletcoinspace" + link: "https://www.microsoft.com/en-us/store/apps/coin-space-digital-currency-wallet/9nblgggz58z9" + source: "https://github.com/CoinSpace/CoinSpace" + screenshot: "coinspacemobile.png" + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencynew" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + - web: + name: web os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencynew" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - ios: - text: "walletcoinspace" - link: "https://itunes.apple.com/us/app/coinspace-bitcoin-wallet/id980719434?mt=8" - source: "https://github.com/CoinSpace/CoinSpace" - screenshot: "coinspacemobile.png" - os: - - ios - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencynew" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - windowsphone: - text: "walletcoinspace" - link: "https://www.microsoft.com/en-us/store/apps/coin-space-digital-currency-wallet/9nblgggz58z9" - source: "https://github.com/CoinSpace/CoinSpace" - screenshot: "coinspacemobile.png" - os: - - windowsphone - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencynew" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - web: - text: "walletcoinspace" - link: "https://coin.space" - source: "https://github.com/CoinSpace/CoinSpace" - screenshot: "coinspaceweb.png" - os: - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkfailenvironmentdesktop" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" + - name: web + text: "walletcoinspace" + link: "https://coin.space" + source: "https://github.com/CoinSpace/CoinSpace" + screenshot: "coinspaceweb.png" + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkfailenvironmentdesktop" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" --- diff --git a/_wallets/copay.md b/_wallets/copay.md index 9c2cdc69..d0ca6ca0 100644 --- a/_wallets/copay.md +++ b/_wallets/copay.md @@ -5,44 +5,54 @@ titleshort: "Copay" compat: "mobile desktop web android ios windowsphone windows mac linux" level: 3 platform: - mobile: - text: "walletcopay" - link: "https://copay.io" - source: "https://github.com/bitpay/copay" - screenshot: "copay.png" + - mobile: + name: mobile + default: &DEFAULT + text: "walletcopay" + link: "https://copay.io" + source: "https://github.com/bitpay/copay" + screenshot: "copay.png" + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkfailprivacynetworknosupporttor" os: - - android - - ios - - windowsphone - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkfailprivacynetworknosupporttor" - desktop: - text: "walletcopay" - link: "https://copay.io/" - source: "https://github.com/bitpay/copay" - screenshot: "copay.png" + - name: android + <<: *DEFAULT + - name: ios + <<: *DEFAULT + - name: windowsphone + <<: *DEFAULT + - desktop: + name: desktop + default: &DEFAULT + text: "walletcopay" + link: "https://copay.io/" + source: "https://github.com/bitpay/copay" + screenshot: "copay.png" + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkfailenvironmentdesktop" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkfailprivacynetworknosupporttor" os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkfailenvironmentdesktop" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkfailprivacynetworknosupporttor" + - name: windows + <<: *DEFAULT + - name: mac + <<: *DEFAULT + - name: linux + <<: *DEFAULT --- diff --git a/_wallets/digitalbitbox.md b/_wallets/digitalbitbox.md index 64ca0f79..c8d6d502 100644 --- a/_wallets/digitalbitbox.md +++ b/_wallets/digitalbitbox.md @@ -5,16 +5,19 @@ titleshort: "Digital
Bitbox" compat: "hardware" level: 2 platform: - hardware: - text: "walletdbb" - link: "https://digitalbitbox.com/" - source: "https://github.com/digitalbitbox/" - screenshot: "digitalbitbox.png" - check: - control: "checkgoodcontrolfull" - validation: "checkneutralvalidationvariable" - transparency: "checkfailtransparencynew" - environment: "checkgoodenvironmenthardware" - privacy: "checkneutralprivacyvariable" - fees: "checkneutralfeecontrolvariable" + - hardware: + name: hardware + os: + - name: hardware + text: "walletdbb" + link: "https://digitalbitbox.com/" + source: "https://github.com/digitalbitbox/" + screenshot: "digitalbitbox.png" + check: + control: "checkgoodcontrolfull" + validation: "checkneutralvalidationvariable" + transparency: "checkfailtransparencynew" + environment: "checkgoodenvironmenthardware" + privacy: "checkneutralprivacyvariable" + fees: "checkneutralfeecontrolvariable" --- diff --git a/_wallets/electrum.md b/_wallets/electrum.md index 8c48ad22..2a7c228e 100644 --- a/_wallets/electrum.md +++ b/_wallets/electrum.md @@ -5,42 +5,48 @@ titleshort: "Electrum" compat: "desktop windows mac linux mobile android" level: 2 platform: - desktop: - text: "walletelectrum" - link: "https://electrum.org" - source: "https://github.com/spesmilo/electrum" - screenshot: "electrum.png" + - desktop: + name: desktop + default: &DEFAULT + text: "walletelectrum" + link: "https://electrum.org" + source: "https://github.com/spesmilo/electrum" + screenshot: "electrum.png" + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkpassprivacynetworksupporttorproxy" os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkpassprivacynetworksupporttorproxy" - android: - text: "walletelectrum" - link: "https://play.google.com/store/apps/details?id=org.electrum.electrum" - source: "https://github.com/spesmilo/electrum" - screenshot: "electrumandroid.png" + - name: windows + <<: *DEFAULT + - name: mac + <<: *DEFAULT + - name: linux + <<: *DEFAULT + - mobile: + name: mobile os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" + - name: android + text: "walletelectrum" + link: "https://play.google.com/store/apps/details?id=org.electrum.electrum" + source: "https://github.com/spesmilo/electrum" + screenshot: "electrumandroid.png" + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" --- diff --git a/_wallets/greenaddress.md b/_wallets/greenaddress.md index 867db7a4..4d30dc60 100644 --- a/_wallets/greenaddress.md +++ b/_wallets/greenaddress.md @@ -5,98 +5,83 @@ titleshort: "Green
Address" compat: "mobile desktop web android ios windows mac linux" level: 3 platform: - mobile: - text: "walletgreenaddress" - link: "https://play.google.com/store/apps/details?id=it.greenaddress.cordova" - source: "https://github.com/greenaddress/WalletCordova" - screenshot: "greenaddressandroid.png" + - mobile: + name: mobile os: - - android - - ios - check: - control: "checkpasscontrolmulti" - validation: "checkpassvalidationservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - desktop: - text: "walletgreenaddress" - link: "https://chrome.google.com/webstore/detail/greenaddressit/dgbimgjoijjemhdamicmljbncacfndmp" - source: "https://github.com/greenaddress/WalletCrx" - screenshot: "greenaddressdesktop.png" + - name: ios + text: "walletgreenaddress" + link: "https://itunes.apple.com/app/id1206035886" + source: "https://github.com/greenaddress/WalletCordova" + screenshot: "greenaddressandroid.png" + check: + control: "checkpasscontrolmulti" + validation: "checkpassvalidationservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + - name: android + text: "walletgreenaddress" + link: "https://play.google.com/store/apps/details?id=it.greenaddress.cordova" + source: "https://github.com/greenaddress/WalletCordova" + screenshot: "greenaddressandroid.png" + check: + control: "checkpasscontrolmulti" + validation: "checkpassvalidationservers" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" + - desktop: + name: desktop + default: &DEFAULT + text: "walletgreenaddress" + link: "https://chrome.google.com/webstore/detail/greenaddressit/dgbimgjoijjemhdamicmljbncacfndmp" + source: "https://github.com/greenaddress/WalletCrx" + screenshot: "greenaddressdesktop.png" + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" os: - - windows - - mac - - linux - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" - web: - text: "walletgreenaddress" - link: "https://chrome.google.com/webstore/detail/greenaddressit/dgbimgjoijjemhdamicmljbncacfndmp" - source: "https://github.com/greenaddress/WalletCrx" - screenshot: "greenaddressdesktop.png" + - name: windows + <<: *DEFAULT + - name: mac + <<: *DEFAULT + - name: linux + <<: *DEFAULT + - web: + name: web os: - check: - control: "checkpasscontrolmulti" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" - ios: - text: "walletgreenaddress" - link: "https://itunes.apple.com/app/id1206035886" - source: "https://github.com/greenaddress/WalletCordova" - screenshot: "greenaddressandroid.png" - os: - - android - - ios - check: - control: "checkpasscontrolmulti" - validation: "checkpassvalidationservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletgreenaddress" - link: "https://play.google.com/store/apps/details?id=it.greenaddress.cordova" - source: "https://github.com/greenaddress/WalletCordova" - screenshot: "greenaddressandroid.png" - os: - - android - - ios - check: - control: "checkpasscontrolmulti" - validation: "checkpassvalidationservers" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkfailprivacynetworknosupporttor" + - name: web + text: "walletgreenaddress" + link: "https://chrome.google.com/webstore/detail/greenaddressit/dgbimgjoijjemhdamicmljbncacfndmp" + source: "https://github.com/greenaddress/WalletCrx" + screenshot: "greenaddressdesktop.png" + check: + control: "checkpasscontrolmulti" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" --- diff --git a/_wallets/greenbits.md b/_wallets/greenbits.md index 5ed7c991..fa05046f 100644 --- a/_wallets/greenbits.md +++ b/_wallets/greenbits.md @@ -5,22 +5,23 @@ titleshort: "GreenBits" compat: "mobile android" level: 2 platform: - mobile: - text: "walletgreenbits" - link: "https://play.google.com/store/apps/details?id=com.greenaddress.greenbits_android_wallet" - source: "https://github.com/greenaddress/GreenBits" - screenshot: "greenbits.png" + - mobile: + name: mobile os: - - android - check: - control: "checkpasscontrolmulti" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmenttwofactor" - privacy: "checkpassprivacybasic" - fees: "checkgoodfeecontrolfull" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" + - name: android + text: "walletgreenbits" + link: "https://play.google.com/store/apps/details?id=com.greenaddress.greenbits_android_wallet" + source: "https://github.com/greenaddress/GreenBits" + screenshot: "greenbits.png" + check: + control: "checkpasscontrolmulti" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + fees: "checkgoodfeecontrolfull" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" --- diff --git a/_wallets/keepkey.md b/_wallets/keepkey.md index 8545fab0..c64985d7 100644 --- a/_wallets/keepkey.md +++ b/_wallets/keepkey.md @@ -5,16 +5,19 @@ titleshort: "KeepKey" compat: "hardware" level: 2 platform: - hardware: - text: "walletkeepkey" - link: "https://www.keepkey.com/" - source: "https://github.com/keepkey/" - screenshot: "keepkey.png" - check: - control: "checkgoodcontrolfull" - validation: "checkneutralvalidationvariable" - transparency: "checkfailtransparencynew" - environment: "checkgoodenvironmenthardware" - privacy: "checkneutralprivacyvariable" - fees: "checkneutralfeecontrolvariable" + - hardware: + name: hardware + os: + - name: hardware + text: "walletkeepkey" + link: "https://www.keepkey.com/" + source: "https://github.com/keepkey/" + screenshot: "keepkey.png" + check: + control: "checkgoodcontrolfull" + validation: "checkneutralvalidationvariable" + transparency: "checkfailtransparencynew" + environment: "checkgoodenvironmenthardware" + privacy: "checkneutralprivacyvariable" + fees: "checkneutralfeecontrolvariable" --- diff --git a/_wallets/ledgernano.md b/_wallets/ledgernano.md index df96f0e8..0ddd5409 100644 --- a/_wallets/ledgernano.md +++ b/_wallets/ledgernano.md @@ -5,16 +5,19 @@ titleshort: "Ledger
Nano" compat: "hardware" level: 2 platform: - hardware: - text: "walletnano" - link: "https://www.ledgerwallet.com/" - source: "https://github.com/LedgerHQ/" - screenshot: "ledger.png" - check: - control: "checkgoodcontrolfull" - validation: "checkneutralvalidationvariable" - transparency: "checkfailtransparencynew" - environment: "checkgoodenvironmenthardware" - privacy: "checkneutralprivacyvariable" - fees: "checkneutralfeecontrolvariable" + - hardware: + name: hardware + os: + - name: hardware + text: "walletnano" + link: "https://www.ledgerwallet.com/" + source: "https://github.com/LedgerHQ/" + screenshot: "ledger.png" + check: + control: "checkgoodcontrolfull" + validation: "checkneutralvalidationvariable" + transparency: "checkfailtransparencynew" + environment: "checkgoodenvironmenthardware" + privacy: "checkneutralprivacyvariable" + fees: "checkneutralfeecontrolvariable" --- diff --git a/_wallets/ledgernanos.md b/_wallets/ledgernanos.md index 59bccbb4..c073f421 100644 --- a/_wallets/ledgernanos.md +++ b/_wallets/ledgernanos.md @@ -5,16 +5,19 @@ titleshort: "Ledger
Nano S" compat: "hardware" level: 2 platform: - hardware: - text: "walletnanos" - link: "https://www.ledgerwallet.com/" - source: "https://github.com/LedgerHQ/" - screenshot: "ledgernanos.png" - check: - control: "checkgoodcontrolfull" - validation: "checkneutralvalidationvariable" - transparency: "checkfailtransparencynew" - environment: "checkgoodenvironmenthardware" - privacy: "checkneutralprivacyvariable" - fees: "checkneutralfeecontrolvariable" + - hardware: + name: hardware + os: + - name: hardware + text: "walletnanos" + link: "https://www.ledgerwallet.com/" + source: "https://github.com/LedgerHQ/" + screenshot: "ledgernanos.png" + check: + control: "checkgoodcontrolfull" + validation: "checkneutralvalidationvariable" + transparency: "checkfailtransparencynew" + environment: "checkgoodenvironmenthardware" + privacy: "checkneutralprivacyvariable" + fees: "checkneutralfeecontrolvariable" --- diff --git a/_wallets/msigna.md b/_wallets/msigna.md index aeca2f82..6a8df842 100644 --- a/_wallets/msigna.md +++ b/_wallets/msigna.md @@ -5,24 +5,29 @@ titleshort: "mSIGNA" compat: "desktop windows mac linux" level: 2 platform: - desktop: - text: "walletmsigna" - link: "https://ciphrex.com/redirect/?referer=bitcoin.org" - source: "https://ciphrex.com/redirect/?url=https://github.com/ciphrex/CoinVault?referer=bitcoin.org" - screenshot: "msigna.png" + - desktop: + name: desktop + default: &DEFAULT + text: "walletmsigna" + link: "https://ciphrex.com/redirect/?referer=bitcoin.org" + source: "https://ciphrex.com/redirect/?url=https://github.com/ciphrex/CoinVault?referer=bitcoin.org" + screenshot: "msigna.png" + check: + control: "checkgoodcontrolfull" + validation: "checkgoodvalidationfullnoderequired" + transparency: "checkpasstransparencyopensource" + environment: "checkfailenvironmentdesktop" + privacy: "checkgoodprivacyimproved" + fees: "checkfailfeecontrolstatic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkpassprivacydisclosurefullnode" + privacynetwork: "checkpassprivacynetworksupporttorproxy" os: - - windows - - mac - - linux - check: - control: "checkgoodcontrolfull" - validation: "checkgoodvalidationfullnoderequired" - transparency: "checkpasstransparencyopensource" - environment: "checkfailenvironmentdesktop" - privacy: "checkgoodprivacyimproved" - fees: "checkfailfeecontrolstatic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkpassprivacydisclosurefullnode" - privacynetwork: "checkpassprivacynetworksupporttorproxy" + - name: windows + <<: *DEFAULT + - name: mac + <<: *DEFAULT + - name: linux + <<: *DEFAULT --- diff --git a/_wallets/mycelium.md b/_wallets/mycelium.md index 460c8bc5..7222b48d 100644 --- a/_wallets/mycelium.md +++ b/_wallets/mycelium.md @@ -5,22 +5,23 @@ titleshort: "Mycelium" compat: "mobile android" level: 3 platform: - mobile: - text: "walletmyceliumwallet" - link: "https://play.google.com/store/apps/details?id=com.mycelium.wallet" - source: "https://github.com/mycelium-com/wallet" - screenshot: "mycelium.png" + - mobile: + name: mobile os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurecentralized" - privacynetwork: "checkpassprivacynetworksupporttorproxy" + - name: android + text: "walletmyceliumwallet" + link: "https://play.google.com/store/apps/details?id=com.mycelium.wallet" + source: "https://github.com/mycelium-com/wallet" + screenshot: "mycelium.png" + check: + control: "checkgoodcontrolfull" + validation: "checkfailvalidationcentralized" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurecentralized" + privacynetwork: "checkpassprivacynetworksupporttorproxy" --- diff --git a/_wallets/simplebitcoinwallet.md b/_wallets/simplebitcoinwallet.md index 459255a3..91d259ea 100644 --- a/_wallets/simplebitcoinwallet.md +++ b/_wallets/simplebitcoinwallet.md @@ -5,40 +5,23 @@ titleshort: "Simple
Bitcoin" compat: "mobile android" level: 2 platform: - mobile: - text: "walletsimplebitcoinwallet" - link: "https://play.google.com/store/apps/details?id=com.btcontract.wallet" - source: "https://github.com/btcontract/wallet" - screenshot: "simplebitcoinwalletandroid.png" + - mobile: + name: mobile os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkfailvalidationcentralized" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" - android: - text: "walletsimplebitcoinwallet" - link: "https://play.google.com/store/apps/details?id=com.btcontract.wallet" - source: "https://github.com/btcontract/wallet" - screenshot: "simplebitcoinwalletandroid.png" - os: - - android - check: - control: "checkgoodcontrolfull" - validation: "checkpassvalidationspvp2p" - transparency: "checkpasstransparencyopensource" - environment: "checkpassenvironmentmobile" - privacy: "checkpassprivacybasic" - fees: "checkpassfeecontroldynamic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" + - name: android + text: "walletsimplebitcoinwallet" + link: "https://play.google.com/store/apps/details?id=com.btcontract.wallet" + source: "https://github.com/btcontract/wallet" + screenshot: "simplebitcoinwalletandroid.png" + check: + control: "checkgoodcontrolfull" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmentmobile" + privacy: "checkpassprivacybasic" + fees: "checkpassfeecontroldynamic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosurespv" + privacynetwork: "checkfailprivacynetworknosupporttor" --- diff --git a/_wallets/trezor.md b/_wallets/trezor.md index 33405280..cd7a29b1 100644 --- a/_wallets/trezor.md +++ b/_wallets/trezor.md @@ -5,16 +5,19 @@ titleshort: "Trezor" compat: "hardware" level: 2 platform: - hardware: - text: "wallettrezor" - link: "https://trezor.io/" - source: "https://github.com/trezor/" - screenshot: "trezor.png" - check: - control: "checkgoodcontrolfull" - validation: "checkneutralvalidationvariable" - transparency: "checkgoodtransparencydeterministic" - environment: "checkgoodenvironmenthardware" - privacy: "checkneutralprivacyvariable" - fees: "checkneutralfeecontrolvariable" + - hardware: + name: hardware + os: + - name: hardware + text: "wallettrezor" + link: "https://trezor.io/" + source: "https://github.com/trezor/" + screenshot: "trezor.png" + check: + control: "checkgoodcontrolfull" + validation: "checkneutralvalidationvariable" + transparency: "checkgoodtransparencydeterministic" + environment: "checkgoodenvironmenthardware" + privacy: "checkneutralprivacyvariable" + fees: "checkneutralfeecontrolvariable" --- diff --git a/_wallets/xapo.md b/_wallets/xapo.md index 8af22a3b..38dba86b 100644 --- a/_wallets/xapo.md +++ b/_wallets/xapo.md @@ -5,19 +5,21 @@ titleshort: "Xapo" compat: "web" level: 4 platform: - web: - text: "walletxapo" - link: "https://xapo.com/" - screenshot: "xapo.png" + - web: + name: web os: - check: - control: "checkfailcontrolthirdpartyinsured" - validation: "checkfailvalidationcentralized" - transparency: "checkfailtransparencyremote" - environment: "checkfailenvironmentdesktop" - privacy: "checkpassprivacybasic" - privacycheck: - privacyaddressreuse: "checkpassprivacyaddressrotation" - privacydisclosure: "checkfailprivacydisclosureaccount" - privacynetwork: "checkpassprivacynetworksupporttorproxy" + - name: web + text: "walletxapo" + link: "https://xapo.com/" + screenshot: "xapo.png" + check: + control: "checkfailcontrolthirdpartyinsured" + validation: "checkfailvalidationcentralized" + transparency: "checkfailtransparencyremote" + environment: "checkfailenvironmentdesktop" + privacy: "checkpassprivacybasic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkpassprivacynetworksupporttorproxy" --- From f5a483c86b65ac57d2b8338abd0db1d0934dde55 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Tue, 18 Jul 2017 17:49:15 +0200 Subject: [PATCH 22/37] Added hardware and web icons (ported from menu) --- img/os/hardware.png | Bin 0 -> 277 bytes img/os/web.png | Bin 0 -> 368 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 img/os/hardware.png create mode 100644 img/os/web.png diff --git a/img/os/hardware.png b/img/os/hardware.png new file mode 100644 index 0000000000000000000000000000000000000000..4dc9d667c8629efd2df34fdfd425ff293be8d718 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHi>R5Fe{y{playfI^ErT^vI!PA4ZU5HNT&adKipLO^Ol zLPAnPLdB5-2MT73G^ZOH82oWRT+745bLL1!UsKkP<3Nd-jg1ePCMilDkth&ab%V>( zhwG$36GNJ{)epX@$KaTS_V&7 KKbLh*2~7aJC0siI literal 0 HcmV?d00001 diff --git a/img/os/web.png b/img/os/web.png new file mode 100644 index 0000000000000000000000000000000000000000..3203e1d9a0ef7422f0422d3d49bc47a038e18708 GIT binary patch literal 368 zcmV-$0gwKPP)qI@s}TEk&-f)DZ>>LqHK~8iyxcGU@#FAe*hMxtduB{%o4(2x!IJ$Vo@$P zl5h<7d%1p;Gd<5a@6OZbbNHu<3Uo@JCdJY=q<@18!j74p~-@{iX@=lqf?4e zWmvV11UUW-?p2eMySl6kXOO%hgaIeH4coePAmvq;c9pW2)@m!C8`gwym-rW9R4B~@ zJuYR0Nc@v=SB46|YDx&@iJSLq=I1pU+{ikx?_NgZU)Q8o9WI=IwLSpf7h4B*`}ko1 O0000 Date: Tue, 18 Jul 2017 17:49:58 +0200 Subject: [PATCH 23/37] Adds support for translation of platform pages --- _platforms/hardware.html | 2 ++ _platforms/web.html | 2 ++ _plugins/wallets.rb | 59 ++++++++++++++++++++++++++-------------- 3 files changed, 43 insertions(+), 20 deletions(-) diff --git a/_platforms/hardware.html b/_platforms/hardware.html index 46d3ef44..fbae9a3c 100644 --- a/_platforms/hardware.html +++ b/_platforms/hardware.html @@ -5,4 +5,6 @@ id: wallets-hardware platform: name: hardware +os: + name: hardware --- diff --git a/_platforms/web.html b/_platforms/web.html index 5a015334..b796c59e 100644 --- a/_platforms/web.html +++ b/_platforms/web.html @@ -5,4 +5,6 @@ id: wallets-web platform: name: web +os: + name: web --- diff --git a/_plugins/wallets.rb b/_plugins/wallets.rb index 515ca1d8..3d8fa866 100644 --- a/_plugins/wallets.rb +++ b/_plugins/wallets.rb @@ -22,6 +22,22 @@ module Jekyll end end + class PlatformPage < Page + def initialize(site, base, dir, platform, os, lang) + @site = site + @base = base + @dir = dir + @name = 'index.html' + + self.process(@name) + self.read_yaml(File.join(base, '_layouts'), 'wallet-platform.html') + self.data['platform'] = platform + self.data['os'] = os + self.data['id'] = ['wallets', platform['name'], os['name']].join('-') + self.data['lang'] = lang + end + end + class WalletsPageGenerator < Generator safe true @@ -29,6 +45,9 @@ module Jekyll # Get the collection of wallets from _wallets walletsCol = site.collections['wallets']; + # Get the collection of wallets from _wallets + platformsCol = site.collections['platforms']; + # Output dir # TODO: Make this configurable and "translatable" walletsDir = 'wallets' @@ -49,38 +68,38 @@ module Jekyll locs[lang] = YAML.load_file("_translations/"+file)[lang] end - puts('----- Generating wallet pages -----') - # Getting information about each found wallet - walletsCol.docs.each do |doc| - file = doc.path - wallet = YAML.load_file(file) - walletPlatforms = wallet['platform'] + locs.each do |lang,value| + platformsCol.docs.each do |doc| + file = doc.path + data = YAML.load_file(file) + platform = data['platform'] + os = data['os'] + dir = File.join(platform['name'], os['name']) + site.pages << PlatformPage.new(site, site.source, File.join(lang, walletsDir, dir), platform, os, lang) + end - puts(wallet['id'] + ' is loaded. Generating pages...') + walletsCol.docs.each do |doc| + file = doc.path + wallet = YAML.load_file(file) + walletPlatforms = wallet['platform'] - # Going through all available combinations of - # platforms and OSes - walletPlatforms.each do |platform| - platform['os'].each do |os| + # Going through all available combinations of + # platforms and OSes + walletPlatforms.each do |platform| + platform['os'].each do |os| - # This allows generation only of valid wallet pages - if platform['name'] - - locs.each do |lang,value| + # This allows generation only of valid wallet pages + if platform['name'] dir = File.join(platform['name'], os['name'], wallet['id']) site.pages << WalletPage.new(site, site.source, File.join(lang, walletsDir, dir), wallet, platform, os, lang) end - end + end end end - - puts(wallet['id'] + ' is processed.') end - puts('----- Wallet pages generated -----') - end end From 7f028a68bab510693c8f7f2833af4a1432f59e95 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Tue, 18 Jul 2017 17:50:37 +0200 Subject: [PATCH 24/37] Fixes wallet menu, list and container for correct links and translation --- _includes/layout/base/wallets-list.html | 8 ++++++-- _includes/layout/base/wallets-menu.html | 9 +++++++-- _layouts/wallet-container.html | 2 ++ _sass/_wallets.scss | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/_includes/layout/base/wallets-list.html b/_includes/layout/base/wallets-list.html index d48430c1..350b2689 100644 --- a/_includes/layout/base/wallets-list.html +++ b/_includes/layout/base/wallets-list.html @@ -8,8 +8,8 @@ http://opensource.org/licenses/MIT. {% assign platform = page.platform['name'] %} {% assign os = page.os['name'] %} {% if wallet.compat contains platform and wallet.compat contains os %} -
- +
+ {{ wallet.title }} {{ wallet.titleshort }} @@ -17,3 +17,7 @@ http://opensource.org/licenses/MIT. {% endif %} {% endfor %}
+ + diff --git a/_includes/layout/base/wallets-menu.html b/_includes/layout/base/wallets-menu.html index 89603f4f..57f1745f 100644 --- a/_includes/layout/base/wallets-menu.html +++ b/_includes/layout/base/wallets-menu.html @@ -26,7 +26,12 @@ http://opensource.org/licenses/MIT. {% assign platformClass = platformClass | append: " active" %} {% endif %}
  • - {% translate walletcat{{platformName}} choose-your-wallet %} + {% if platformName == 'hardware' or platformName == 'web' %} + {% assign platformHref = "/" | append: page.lang | append: "/wallets/" | append: platformName | append: "/" | append: platformName | append: "/" %} + {% else %} + {% assign platformHref = "#" %} + {% endif %} + {% translate walletcat{{platformName}} choose-your-wallet %} {% if platform.items.size > 1 %}
      {% for item in platform.items %} @@ -35,7 +40,7 @@ http://opensource.org/licenses/MIT. {% assign osClass = osClass | append: " active" %} {% endif %}
    • - + {% translate platform{{item.os.name}} choose-your-wallet %}
    • diff --git a/_layouts/wallet-container.html b/_layouts/wallet-container.html index 4ec055dd..84c90e83 100644 --- a/_layouts/wallet-container.html +++ b/_layouts/wallet-container.html @@ -33,6 +33,7 @@ max_wallet_text_length: 418 ## Unicode characters alt="{% translate platform{{os.name}} choose-your-wallet %}" title="{% translate platform{{os.name}} choose-your-wallet %}" /> {% translate platform{{os.name}} choose-your-wallet %} + {% translate walletcat{{os.name}} choose-your-wallet %} {% endfor %} {% endfor %} @@ -47,6 +48,7 @@ max_wallet_text_length: 418 ## Unicode characters alt="{% translate platform{{os.name}} choose-your-wallet %}" title="{% translate platform{{os.name}} choose-your-wallet %}" />

      {% translate platform{{os.name}} choose-your-wallet %}

      +

      {% translate walletcat{{os.name}} choose-your-wallet %}

  • {% if os.link == 'bitcoincore' %} diff --git a/_sass/_wallets.scss b/_sass/_wallets.scss index 48b6dadc..b45a8309 100644 --- a/_sass/_wallets.scss +++ b/_sass/_wallets.scss @@ -387,6 +387,7 @@ $scores: .hover { .wallet-os-check-details { + z-index: 100; display: block; border: 2px solid; border-radius: 4px; From 5e53d82c8c9bfdebf55c20a8f9b9393a2bee5939 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Tue, 18 Jul 2017 17:52:11 +0200 Subject: [PATCH 25/37] Cleans up a bit main.js from unused functions --- js/main.js | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/js/main.js b/js/main.js index fa4afbf4..4ed71b99 100644 --- a/js/main.js +++ b/js/main.js @@ -463,45 +463,9 @@ function walletShowPlatform(platform) { var p = t.parentNode.parentNode.parentNode; if (p.nodeName === 'LI') addClass(p, 'active'); } - }, - updateWallets = function() { - // Replace wallets by those for given platform and rotate them. - var p = document.getElementById('wallets'); - var lasttimeout = p.getAttribute('data-timeout'); - var timeout = (lasttimeout !== null && lasttimeout !== '' && supportCSS('transition')) ? 200 : 1; - addClass(p, 'disabled'); - addClass(p, 'nohover'); - clearTimeout(lasttimeout); - p.setAttribute('data-timeout', setTimeout(function() { - p.innerHTML = ''; - var platforms = (platform === 'default') ? ['desktop', 'mobile'] : [platform]; - for (var i = 0, nds = document.getElementById('walletsswitch').childNodes, n = nds.length; i < n; i++) { - if (nds[i].nodeType !== 1) continue; - var id = nds[i].id.split('-')[1]; - // for wallets with multiple listings, only show one instance per view - if (document.getElementById('wallet-' + id)) continue; - var nd = null; - for (var ii = 0, nn = platforms.length; ii < nn; ii++) { - var wp = document.getElementById('wallet-' + id + '-' + platforms[ii]); - if (wp) var nd = wp; - } - if (nd === null) { - var wf = document.getElementById('wallet-' + id + '-' + fallback); - if (wf && wf.getAttribute('data-walletcompat').indexOf(platform) !== -1) var nd = wf; - } - if (nd === null) continue; - nd = nd.cloneNode(true); - nd.id = 'wallet-' + id; - p.appendChild(nd); - } - walletRotate(); - removeClass(p, 'disabled'); - document.getElementById('walletsmobile').innerHTML = ''; - }, timeout)); }; if (!getMenuState()) return; updateMenu(); - updateWallets(); } function walletRotate() { From 9c60aacb41dd169ef0cfa5f8aeae3c1796291fb9 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Tue, 18 Jul 2017 17:52:43 +0200 Subject: [PATCH 26/37] Removes platform and wallets from output collections --- _config.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/_config.yml b/_config.yml index bd508c24..7da519af 100644 --- a/_config.yml +++ b/_config.yml @@ -580,8 +580,7 @@ collections: output: false ## _platforms platforms: - output: true - permalink: /en/wallets/:path/ + output: false defaults: - scope: @@ -601,16 +600,6 @@ defaults: - bcc - bcc news - RELEASE - - scope: - path: "" - type: wallets - values: - layout: wallet-container - - scope: - path: "" - type: platforms - values: - layout: wallet-platform - scope: path: "" type: posts From 83be9af811d241464332b91b10c53ed6453105c9 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Tue, 18 Jul 2017 18:37:01 +0200 Subject: [PATCH 27/37] Adds missing licence notes --- _layouts/wallet-platform-container.html | 3 +++ _wallets/airbitzwallet.md | 3 +++ _wallets/arcbit.md | 3 +++ _wallets/armory.md | 3 +++ _wallets/bitcoincore.md | 3 +++ _wallets/bitcoinknots.md | 3 +++ _wallets/bitcoinwallet.md | 3 +++ _wallets/bitgo.md | 3 +++ _wallets/bither.md | 3 +++ _wallets/breadwallet.md | 3 +++ _wallets/btc.com.md | 3 +++ _wallets/coinapult.md | 3 +++ _wallets/coinbase.md | 3 +++ _wallets/coinspace.md | 3 +++ _wallets/copay.md | 3 +++ _wallets/digitalbitbox.md | 3 +++ _wallets/electrum.md | 3 +++ _wallets/greenaddress.md | 3 +++ _wallets/greenbits.md | 3 +++ _wallets/keepkey.md | 3 +++ _wallets/ledgernano.md | 3 +++ _wallets/ledgernanos.md | 3 +++ _wallets/msigna.md | 3 +++ _wallets/mycelium.md | 3 +++ _wallets/simplebitcoinwallet.md | 3 +++ _wallets/trezor.md | 3 +++ _wallets/xapo.md | 3 +++ 27 files changed, 81 insertions(+) diff --git a/_layouts/wallet-platform-container.html b/_layouts/wallet-platform-container.html index 8443391a..6a570601 100644 --- a/_layouts/wallet-platform-container.html +++ b/_layouts/wallet-platform-container.html @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + layout: base --- diff --git a/_wallets/airbitzwallet.md b/_wallets/airbitzwallet.md index 45e11b5c..86ead582 100644 --- a/_wallets/airbitzwallet.md +++ b/_wallets/airbitzwallet.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: airbitzwallet title: "Airbitz Bitcoin Wallet" titleshort: "Airbitz" diff --git a/_wallets/arcbit.md b/_wallets/arcbit.md index 3afef038..7a4e4d25 100644 --- a/_wallets/arcbit.md +++ b/_wallets/arcbit.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: arcbit title: "ArcBit" titleshort: "ArcBit" diff --git a/_wallets/armory.md b/_wallets/armory.md index d8fd5e89..245eef1c 100644 --- a/_wallets/armory.md +++ b/_wallets/armory.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: armory title: "Armory" titleshort: "Armory" diff --git a/_wallets/bitcoincore.md b/_wallets/bitcoincore.md index 9e6806cf..ca9a8072 100644 --- a/_wallets/bitcoincore.md +++ b/_wallets/bitcoincore.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: bitcoincore title: "Bitcoin Core" titleshort: "Bitcoin
    Core" diff --git a/_wallets/bitcoinknots.md b/_wallets/bitcoinknots.md index a6086d78..5f97c544 100644 --- a/_wallets/bitcoinknots.md +++ b/_wallets/bitcoinknots.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: bitcoinknots title: "Bitcoin Knots" titleshort: "Bitcoin
    Knots" diff --git a/_wallets/bitcoinwallet.md b/_wallets/bitcoinwallet.md index 74fff826..39502ddd 100644 --- a/_wallets/bitcoinwallet.md +++ b/_wallets/bitcoinwallet.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: bitcoinwallet title: "Bitcoin Wallet" titleshort: "Bitcoin
    Wallet" diff --git a/_wallets/bitgo.md b/_wallets/bitgo.md index 04018fa9..6739213f 100644 --- a/_wallets/bitgo.md +++ b/_wallets/bitgo.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: bitgo title: "BitGo" titleshort: "BitGo" diff --git a/_wallets/bither.md b/_wallets/bither.md index e2d4fe94..731182b8 100644 --- a/_wallets/bither.md +++ b/_wallets/bither.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: bither title: "Bither" titleshort: "Bither" diff --git a/_wallets/breadwallet.md b/_wallets/breadwallet.md index 8bb8826d..fd0b3059 100644 --- a/_wallets/breadwallet.md +++ b/_wallets/breadwallet.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: breadwallet title: "breadwallet" titleshort: "breadwallet" diff --git a/_wallets/btc.com.md b/_wallets/btc.com.md index 4f179336..ac30fa4c 100644 --- a/_wallets/btc.com.md +++ b/_wallets/btc.com.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: btc.com title: "BTC.com Bitcoin Wallet" titleshort: "BTC.com" diff --git a/_wallets/coinapult.md b/_wallets/coinapult.md index f398a154..edc0c3cb 100644 --- a/_wallets/coinapult.md +++ b/_wallets/coinapult.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: coinapult title: "Coinapult" titleshort: "Coinapult" diff --git a/_wallets/coinbase.md b/_wallets/coinbase.md index 0c2f4cd2..a1a72884 100644 --- a/_wallets/coinbase.md +++ b/_wallets/coinbase.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: coinbase title: "Coinbase" titleshort: "Coinbase" diff --git a/_wallets/coinspace.md b/_wallets/coinspace.md index 1acd3c09..bfa9e124 100644 --- a/_wallets/coinspace.md +++ b/_wallets/coinspace.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: coinspace title: "Coin.Space" titleshort: "Coin.Space" diff --git a/_wallets/copay.md b/_wallets/copay.md index d0ca6ca0..aa7a0013 100644 --- a/_wallets/copay.md +++ b/_wallets/copay.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: copay title: "Copay" titleshort: "Copay" diff --git a/_wallets/digitalbitbox.md b/_wallets/digitalbitbox.md index c8d6d502..eec0d07b 100644 --- a/_wallets/digitalbitbox.md +++ b/_wallets/digitalbitbox.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: digitalbitbox title: "DigitalBitbox" titleshort: "Digital
    Bitbox" diff --git a/_wallets/electrum.md b/_wallets/electrum.md index 2a7c228e..4f44c1da 100644 --- a/_wallets/electrum.md +++ b/_wallets/electrum.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: electrum title: "Electrum" titleshort: "Electrum" diff --git a/_wallets/greenaddress.md b/_wallets/greenaddress.md index 4d30dc60..37a1e31d 100644 --- a/_wallets/greenaddress.md +++ b/_wallets/greenaddress.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: greenaddress title: "GreenAddress" titleshort: "Green
    Address" diff --git a/_wallets/greenbits.md b/_wallets/greenbits.md index fa05046f..7cc250a7 100644 --- a/_wallets/greenbits.md +++ b/_wallets/greenbits.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: greenbits title: "GreenBits" titleshort: "GreenBits" diff --git a/_wallets/keepkey.md b/_wallets/keepkey.md index c64985d7..a078e80f 100644 --- a/_wallets/keepkey.md +++ b/_wallets/keepkey.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: keepkey title: "KeepKey" titleshort: "KeepKey" diff --git a/_wallets/ledgernano.md b/_wallets/ledgernano.md index 0ddd5409..e8da8df8 100644 --- a/_wallets/ledgernano.md +++ b/_wallets/ledgernano.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: ledgernano title: "Ledger Nano" titleshort: "Ledger
    Nano" diff --git a/_wallets/ledgernanos.md b/_wallets/ledgernanos.md index c073f421..2dc25c1f 100644 --- a/_wallets/ledgernanos.md +++ b/_wallets/ledgernanos.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: ledgernanos title: "Ledger Nano S" titleshort: "Ledger
    Nano S" diff --git a/_wallets/msigna.md b/_wallets/msigna.md index 6a8df842..5bb972b9 100644 --- a/_wallets/msigna.md +++ b/_wallets/msigna.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: msigna title: "mSIGNA" titleshort: "mSIGNA" diff --git a/_wallets/mycelium.md b/_wallets/mycelium.md index 7222b48d..74abfc33 100644 --- a/_wallets/mycelium.md +++ b/_wallets/mycelium.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: mycelium title: "Mycelium" titleshort: "Mycelium" diff --git a/_wallets/simplebitcoinwallet.md b/_wallets/simplebitcoinwallet.md index 91d259ea..b62247ef 100644 --- a/_wallets/simplebitcoinwallet.md +++ b/_wallets/simplebitcoinwallet.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: simplebitcoinwallet title: "Simple Bitcoin Wallet" titleshort: "Simple
    Bitcoin" diff --git a/_wallets/trezor.md b/_wallets/trezor.md index cd7a29b1..268cb0e5 100644 --- a/_wallets/trezor.md +++ b/_wallets/trezor.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: trezor title: "Trezor" titleshort: "Trezor" diff --git a/_wallets/xapo.md b/_wallets/xapo.md index 38dba86b..5d07df84 100644 --- a/_wallets/xapo.md +++ b/_wallets/xapo.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + id: xapo title: "Xapo" titleshort: "Xapo" From e5efe43abf1530a94aa94e736ea9787fb9ecf172 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Tue, 18 Jul 2017 20:09:34 +0200 Subject: [PATCH 28/37] Updates and softens a bit a wallet schema to support the current structure --- _contrib/schema-validator.rb | 7 +- _wallets/bitcoinwallet.md | 3 - _wallets/bitgo.md | 1 - quality-assurance/schemas/wallets.yaml | 483 ++++++++++--------------- 4 files changed, 198 insertions(+), 296 deletions(-) diff --git a/_contrib/schema-validator.rb b/_contrib/schema-validator.rb index aa310a35..f509981b 100755 --- a/_contrib/schema-validator.rb +++ b/_contrib/schema-validator.rb @@ -24,8 +24,9 @@ file.close() results = JSON::Validator.fully_validate(schema, document) if results.empty? - exit(0) + exit(0) else - puts results - exit(1) + puts ARGV[1] + puts results + exit(1) end diff --git a/_wallets/bitcoinwallet.md b/_wallets/bitcoinwallet.md index 39502ddd..e053cacc 100644 --- a/_wallets/bitcoinwallet.md +++ b/_wallets/bitcoinwallet.md @@ -32,9 +32,6 @@ platform: link: "https://appworld.blackberry.com/webstore/content/23952882/" source: "https://github.com/bitcoin-wallet/bitcoin-wallet" screenshot: "bitcoinwalletandroid.png" - os: - - android - - blackberry check: control: "checkgoodcontrolfull" validation: "checkpassvalidationspvp2p" diff --git a/_wallets/bitgo.md b/_wallets/bitgo.md index 6739213f..e91bdafb 100644 --- a/_wallets/bitgo.md +++ b/_wallets/bitgo.md @@ -40,7 +40,6 @@ platform: text: "walletbitgo" link: "https://www.bitgo.com/" screenshot: "bitgo.png" - os: check: control: "checkpasscontrolmulti" validation: "checkfailvalidationcentralized" diff --git a/quality-assurance/schemas/wallets.yaml b/quality-assurance/schemas/wallets.yaml index b490c5fd..2e704573 100644 --- a/quality-assurance/schemas/wallets.yaml +++ b/quality-assurance/schemas/wallets.yaml @@ -2,317 +2,222 @@ # This file is licensed under the MIT License (MIT) available on # http://opensource.org/licenses/MIT. id: https://bitcoin.org/quality-assurance/schemas/wallets.yaml -description: The main container +description: The wallet object type: object required: - - layout - id - - wallets -additionalProperties: false -properties: - layout: - description: The Jekyll page layout to use - type: string - enum: - - base + - title + - titleshort + - compat + - level + - platform +# additionalProperties can not be true, as then the wallet fails due to license +properties: id: description: The page identifier to use for translations type: string - max_wallet_text_length: - description: > - The global maximum length for a wallet text description in any - langugage (counted in Unicode characters). Ensures text doesn't - overfill its box. + title: + description: The full wallet name; displayed when you view the full listing + type: string + minLength: 1 + maxLength: 100 + + titleshort: + description: A short name displayed on the overview page + type: string + minLength: 1 + maxLength: 20 + + ## TODO: change this into an array so we can practically test values + compat: + description: A complete list of platforms supported by the wallet + type: string + minLength: 1 + + ## TODO: we should probably use names here and translate to + ## numbers (if required) in the template + level: + description: | + The wallet's overall security level. + 1 - full nodes + 2 - SPV using random servers (e.g. P2P SPV, Electrum servers, etc...) + 3 - Hybrid & multisig wallets + 4 - Web wallets + type: integer + minimum: 1 + maximum: 4 - ## The wallets array - wallets: - description: The array containing all wallets + ## The platforms the wallet supports + platform: + description: the platforms the wallet supports type: array - uniqueItems: true + additionalProperties: false items: - description: The wallets. Each value is an arbitrary ID type: object - additionalProperties: ## matches anything since this is an arbitrary ID string - required: - - title - - titleshort - - compat - - level - - platform - additionalProperties: false - properties: - title: - description: The full wallet name; displayed when you view the full listing - type: string - minLength: 1 - maxLength: 100 + additionalProperties: + - default - titleshort: - description: A short name displayed on the overview page - type: string - minLength: 1 - maxLength: 20 + required: + - os + - name - ## TODO: change this into an array so we can practically test values - compat: - description: A complete list of platforms supported by the wallet - type: string - minLength: 1 - - ## TODO: we should probably use names here and translate to - ## numbers (if required) in the template - level: - description: | - The wallet's overall security level. - 1 - full nodes - 2 - SPV using random servers (e.g. P2P SPV, Electrum servers, etc...) - 3 - Hybrid & multisig wallets - 4 - Web wallets - - type: integer - minimum: 1 - maximum: 4 - - ## The platforms the wallet supports - platform: - description: the platforms the wallet supports + properties: + name: + type: string + enum: + - desktop + - mobile + - hardware + - web + os: + description: The specific operating systems the wallet supports + type: array + uniqueItems: true + items: + description: List of operating systems with wallet details type: object - additionalProperties: false - ## Wallets that want to use different names, screenshots, - ## download URLs, or scoring for different versions (e.g. an - ## Android version and an iOS version) must declare both a - ## default platform for the main platform (desktop, mobile, - ## hardware, web) and then a sub-platform in the platform field - ## for any entries that diverge from the default (android, ios, - ## blackberry, etc...). We use a long hand-maintained list of - ## dependencies here to ensure that any wallet using a - ## sub-platform also declares main platform. - # - ## TODO: refactor YAML to get rid of this weirdness - dependencies: - android: - - mobile - ios: - - mobile - blackberry: - - mobile - windowsphone: - - mobile - windows: - - desktop - linux: - - desktop - mac: - - desktop + required: &required + - name + - text + - link + - screenshot + - check + ## TODO: Not currently required, but we should aim for making it required # + # - source + additionalProperties: + - privacycheck properties: - desktop: - description: Wallets that run on desktop operating systems - type: object - required: &desktop-required - - text - - link - # - source ## TODO: Not currently required, but we should aim for making it required - - screenshot - - os - - check - - privacycheck - additionalProperties: false - properties: - text: &text - description: > - The identifier for the wallet's translation string. - Also used for the wallet's icon within the /img/wallet/ - directory. - type: string - link: &link - description: The download URL - type: string - format: uri - source: &source - description: The source code download URL - type: string - format: uri - screenshot: &screenshot - description: File name for screenshot within the /img/screenshots/ directory - type: string - os: - description: The specific operating systems the wallet supports - type: array - uniqueItems: true - items: - type: string - enum: - - windows - - mac - - linux - check: &check - description: The wallet's features (or lack thereof) - type: object - required: - - control - - validation - - transparency - - environment - - privacy - # - fees ## TODO: make required when web wallets moved - additionalProperties: false - properties: - control: - description: How much control the user has over their money (e.g. private keys) - type: string - enum: - - checkgoodcontrolfull - - checkpasscontrolhybrid - - checkpasscontrolmulti - - checkfailcontrolthirdpartyinsured - - checkfailcontrolthirdparty - validation: - description: How much assurance the user has that their bitcoins are real - type: string - enum: - - checkgoodvalidationfullnode - - checkgoodvalidationfullnoderequired - - checkneutralvalidationvariable - - checkpassvalidationspvp2p - - checkpassvalidationspvservers - - checkpassvalidationservers - - checkfailvalidationcentralized - transparency: - description: How much insight the user has into the code they run - type: string - enum: - - checkgoodtransparencydeterministic - - checkpasstransparencyopensource - - checkpasstransparencyopensourcehardware - - checkpasstransparencyopenspechardware - - checkfailtransparencyclosedsource - - checkfailtransparencyremote - - checkfailtransparencynew - environment: - description: How secure is the environment the wallet runs in - type: string - enum: - - checkgoodenvironmenthardware - - checkpassenvironmentmobile - - checkpassenvironmenttwofactor - - checkfailenvironmentdesktop - privacy: - description: How much privacy the wallet gives the user - type: string - enum: - - checkgoodprivacyimproved - - checkpassprivacybasic - - checkneutralprivacyvariable - - checkfailprivacyweak - fees: - description: How does the wallet decide what fee to pay - type: string - enum: - - checkgoodfeecontrolfull - - checkpassfeecontroldynamic - - checkpassfeecontroloverride - - checkneutralfeecontrolvariable - - checkfailfeecontrolstatic - privacycheck: &privacycheck - description: Details about the wallet's privacy settings - type: object - required: - - privacyaddressreuse - - privacydisclosure - - privacynetwork - additionalProperties: false - properties: - privacyaddressreuse: - description: Does the wallet default to address reuse? - type: string - enum: - - checkpassprivacyaddressrotation - - checkfailprivacyaddressrotation - privacydisclosure: - description: To whom, if anyone, does the wallet reveal the addresses it uses? - type: string - enum: - - checkpassprivacydisclosurefullnode - - checkfailprivacydisclosurespv - - checkfailprivacydisclosurecentralized - - checkfailprivacydisclosureaccount - privacynetwork: - description: What network-level privacy options does the wallet support - type: string - enum: - - checkpassprivacynetworksupporttorproxy - - checkfailprivacynetworknosupporttor - - - mobile: &mobile - description: Wallets that run on mobile devices with limited operating systems - type: object - required: *desktop-required - properties: - text: *text - link: *link - source: *source - screenshot: *screenshot - os: - description: The specific operating systems the wallet supports - type: array - uniqueItems: true - items: - type: string - enum: - - android - - blackberry - - ios - - windowsphone - check: *check - privacycheck: *privacycheck - ## Aliases for the mobile platform to allow setting - ## specific download URLs and screenshots for apps on - ## different mobile platforms - android: *mobile - ios: *mobile - blackberry: *mobile - windowsphone: *mobile - - web: - description: Wallets that run in a web browser + name: + type: string + enum: + # mobile os + - android + - windowsphone + - blackberry + - ios + # desktop os + - windows + - mac + - linux + # pseudo web os + - web + # pseudo hardware os + - hardware + text: &text + description: > + The identifier for the wallet's translation string. + Also used for the wallet's icon within the /img/wallet/ + directory. + type: string + link: &link + description: The download URL + type: string + format: uri + source: &source + description: The source code download URL + type: string + format: uri + screenshot: &screenshot + description: File name for screenshot within the /img/screenshots/ directory + type: string + check: &check + description: The wallet's features (or lack thereof) type: object required: - - text - - link - # - source ## Not required :-( - - screenshot - - os - - check - - privacycheck + - control + - validation + - transparency + - environment + - privacy + ## TODO: make required when web wallets moved + # - fees additionalProperties: false properties: - text: *text - link: *link - source: *source - screenshot: *screenshot - os: - type: null - check: *check - privacycheck: *privacycheck - - hardware: - description: Transaction-signing hardware that works in conjunction with software that interacts with the network + control: + description: How much control the user has over their money (e.g. private keys) + type: string + enum: + - checkgoodcontrolfull + - checkpasscontrolhybrid + - checkpasscontrolmulti + - checkfailcontrolthirdpartyinsured + - checkfailcontrolthirdparty + validation: + description: How much assurance the user has that their bitcoins are real + type: string + enum: + - checkgoodvalidationfullnode + - checkgoodvalidationfullnoderequired + - checkneutralvalidationvariable + - checkpassvalidationspvp2p + - checkpassvalidationspvservers + - checkpassvalidationservers + - checkfailvalidationcentralized + transparency: + description: How much insight the user has into the code they run + type: string + enum: + - checkgoodtransparencydeterministic + - checkpasstransparencyopensource + - checkpasstransparencyopensourcehardware + - checkpasstransparencyopenspechardware + - checkfailtransparencyclosedsource + - checkfailtransparencyremote + - checkfailtransparencynew + environment: + description: How secure is the environment the wallet runs in + type: string + enum: + - checkgoodenvironmenthardware + - checkpassenvironmentmobile + - checkpassenvironmenttwofactor + - checkfailenvironmentdesktop + privacy: + description: How much privacy the wallet gives the user + type: string + enum: + - checkgoodprivacyimproved + - checkpassprivacybasic + - checkneutralprivacyvariable + - checkfailprivacyweak + fees: + description: How does the wallet decide what fee to pay + type: string + enum: + - checkgoodfeecontrolfull + - checkpassfeecontroldynamic + - checkpassfeecontroloverride + - checkneutralfeecontrolvariable + - checkfailfeecontrolstatic + privacycheck: &privacycheck + description: Details about the wallet's privacy settings type: object required: - - text - - link - - source - - screenshot - - check + - privacyaddressreuse + - privacydisclosure + - privacynetwork additionalProperties: false properties: - text: *text - link: *link - source: *source - screenshot: *screenshot - check: *check - + privacyaddressreuse: + description: Does the wallet default to address reuse? + type: string + enum: + - checkpassprivacyaddressrotation + - checkfailprivacyaddressrotation + privacydisclosure: + description: To whom, if anyone, does the wallet reveal the addresses it uses? + type: string + enum: + - checkpassprivacydisclosurefullnode + - checkfailprivacydisclosurespv + - checkfailprivacydisclosurecentralized + - checkfailprivacydisclosureaccount + privacynetwork: + description: What network-level privacy options does the wallet support + type: string + enum: + - checkpassprivacynetworksupporttorproxy + - checkfailprivacynetworknosupporttor From 72215e9a1135d279e0512aee3dad489f0ef1ff11 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Tue, 18 Jul 2017 20:10:03 +0200 Subject: [PATCH 29/37] Updates yaml validation step in Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fb27bc42..2119ec40 100644 --- a/Makefile +++ b/Makefile @@ -296,4 +296,4 @@ check-for-too-many-wallets-on-one-platform: check-validate-yaml: ## Validate YAML files against schemas - $S bundle exec _contrib/schema-validator.rb quality-assurance/schemas/wallets.yaml _templates/choose-your-wallet.html + $S find _wallets -type f -exec bundle exec _contrib/schema-validator.rb quality-assurance/schemas/wallets.yaml {} \; From eff65364c426fad4970421c957f1efedef8f86e0 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Tue, 18 Jul 2017 21:18:06 +0200 Subject: [PATCH 30/37] Fixes issues found by tests --- _includes/layout/base/wallets-menu.html | 2 +- _layouts/wallet-container.html | 10 ++++------ _layouts/wallet-platform-container.html | 2 +- _wallets/copay.md | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/_includes/layout/base/wallets-menu.html b/_includes/layout/base/wallets-menu.html index 57f1745f..09faf299 100644 --- a/_includes/layout/base/wallets-menu.html +++ b/_includes/layout/base/wallets-menu.html @@ -40,7 +40,7 @@ http://opensource.org/licenses/MIT. {% assign osClass = osClass | append: " active" %} {% endif %}
  • - + {% translate platform{{item.os.name}} choose-your-wallet %}
  • diff --git a/_layouts/wallet-container.html b/_layouts/wallet-container.html index 84c90e83..dc6ed802 100644 --- a/_layouts/wallet-container.html +++ b/_layouts/wallet-container.html @@ -30,10 +30,9 @@ max_wallet_text_length: 418 ## Unicode characters {% translate platform{{os.name}} choose-your-wallet %} - {% translate platform{{os.name}} choose-your-wallet %} - {% translate walletcat{{os.name}} choose-your-wallet %} + {% translate platform{{os.name}} choose-your-wallet %}{% translate walletcat{{os.name}} choose-your-wallet %} {% endfor %} {% endfor %} @@ -45,10 +44,9 @@ max_wallet_text_length: 418 ## Unicode characters
    {% translate platform{{os.name}} choose-your-wallet %} -

    {% translate platform{{os.name}} choose-your-wallet %}

    -

    {% translate walletcat{{os.name}} choose-your-wallet %}

    +

    {% translate platform{{os.name}} choose-your-wallet %}{% translate walletcat{{os.name}} choose-your-wallet %}

    {% if os.link == 'bitcoincore' %} diff --git a/_layouts/wallet-platform-container.html b/_layouts/wallet-platform-container.html index 6a570601..ef317f2a 100644 --- a/_layouts/wallet-platform-container.html +++ b/_layouts/wallet-platform-container.html @@ -11,7 +11,7 @@ layout: base {% include layout/base/wallets-list.html %}
    -

    +

    warning {% translate educate choose-your-wallet %}

    diff --git a/_wallets/copay.md b/_wallets/copay.md index aa7a0013..0a79b039 100644 --- a/_wallets/copay.md +++ b/_wallets/copay.md @@ -5,7 +5,7 @@ id: copay title: "Copay" titleshort: "Copay" -compat: "mobile desktop web android ios windowsphone windows mac linux" +compat: "mobile desktop android ios windowsphone windows mac linux" level: 3 platform: - mobile: From 4476af6a9f42c05c46a4e9f8f82dfe2a74492a8c Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Wed, 19 Jul 2017 10:03:09 +0200 Subject: [PATCH 31/37] Adds empty title test to Makefile and fixes titles in generated wallet pages --- Makefile | 20 ++++++++++++++++++-- _plugins/wallets.rb | 31 +++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2119ec40..dff4c987 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ ## This file is licensed under the MIT License (MIT) available on ## http://opensource.org/licenses/MIT. -S=@ ## Silent: only print errors by default; +S=@ ## Silent: only print errors by default; ## run `make S='' [other args]` to print commands as they're run SITEDIR=_site @@ -67,6 +67,7 @@ post-build-tests-fast: check-for-build-errors ensure-each-svg-has-a-png check-fo check-for-missing-anchors check-for-broken-markdown-reference-links \ check-for-broken-kramdown-tables check-for-duplicate-header-ids \ check-for-headers-containing-auto-link check-for-missing-subhead-links \ + check-for-empty-title-tag \ check-for-subheading-anchors \ check-jshint \ check-for-javascript-in-svgs @@ -126,7 +127,7 @@ ensure-each-svg-has-a-png: ; do test -f $${file%.svg}.png || echo "$$file missing corresponding PNG" \ ; done | eval $(ERROR_ON_OUTPUT) - + ## Some Jekyll errors leave error messages in the text check-for-liquid-errors: $S grep -r 'Liquid syntax error:' $(SITEDIR)/ | eval $(ERROR_ON_OUTPUT) @@ -182,6 +183,21 @@ check-for-headers-containing-auto-link: ## 'class="auto-link"' produced by autocrossref $S grep '<\(h[2-6]\).*\?>[^>]\+class="auto-link".*' _site/en/developer-* | eval $(ERROR_ON_OUTPUT) +check-for-empty-title-tag: +## The autocrossref plugin can mess up subheadings (h2, etc), so ensure +## none of the generated subheadings contain the string +## 'class="auto-link"' produced by autocrossref + $S find ./_site -name '*.html' -type f \ + | xargs grep '' \ + | eval $(ERROR_ON_OUTPUT) + +check-for-missing-subhead-links: +## Make sure each subhead (h2-h6) either has the subhead links +## (edit,issue,etc) or something like + $S egrep -n -A1 ' diff --git a/_plugins/wallets.rb b/_plugins/wallets.rb index 3d8fa866..c7c58e09 100644 --- a/_plugins/wallets.rb +++ b/_plugins/wallets.rb @@ -6,7 +6,7 @@ require 'yaml' module Jekyll class WalletPage < Page - def initialize(site, base, dir, wallet, platform, os, lang) + def initialize(site, base, dir, wallet, platform, os, title, lang) @site = site @base = base @dir = dir @@ -19,11 +19,12 @@ module Jekyll self.data['os'] = os self.data['id'] = ['wallets', platform['name'], os['name'], wallet['id']].join('-') self.data['lang'] = lang + self.data['title'] = title end end class PlatformPage < Page - def initialize(site, base, dir, platform, os, lang) + def initialize(site, base, dir, platform, os, title, lang) @site = site @base = base @dir = dir @@ -35,6 +36,7 @@ module Jekyll self.data['os'] = os self.data['id'] = ['wallets', platform['name'], os['name']].join('-') self.data['lang'] = lang + self.data['title'] = title end end @@ -70,13 +72,23 @@ module Jekyll # Getting information about each found wallet locs.each do |lang,value| + title = locs[lang]['choose-your-wallet']['title'] + platformsCol.docs.each do |doc| file = doc.path data = YAML.load_file(file) platform = data['platform'] os = data['os'] dir = File.join(platform['name'], os['name']) - site.pages << PlatformPage.new(site, site.source, File.join(lang, walletsDir, dir), platform, os, lang) + + platformTitle = locs[lang]['choose-your-wallet']['walletcat' + platform['name']] + osTitle = locs[lang]['choose-your-wallet']['platform' + os['name']] + if osTitle.nil? + fullTitle = [platformTitle, title].join(' - ') + else + fullTitle = [platformTitle, osTitle, title].join(' - ') + end + site.pages << PlatformPage.new(site, site.source, File.join(lang, walletsDir, dir), platform, os, fullTitle, lang) end walletsCol.docs.each do |doc| @@ -92,7 +104,18 @@ module Jekyll # This allows generation only of valid wallet pages if platform['name'] dir = File.join(platform['name'], os['name'], wallet['id']) - site.pages << WalletPage.new(site, site.source, File.join(lang, walletsDir, dir), wallet, platform, os, lang) + + platformTitle = locs[lang]['choose-your-wallet']['walletcat' + platform['name']] + osTitle = locs[lang]['choose-your-wallet']['platform' + os['name']] + walletTitle = wallet['title'] + + if osTitle.nil? + fullTitle = [walletTitle, platformTitle, title].join(' - ') + else + fullTitle = [walletTitle, platformTitle, osTitle, title].join(' - ') + end + + site.pages << WalletPage.new(site, site.source, File.join(lang, walletsDir, dir), wallet, platform, os, fullTitle, lang) end end From 9e622be29fe52bee388c8eebefb1e2e13f02468e Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Wed, 19 Jul 2017 12:21:40 +0200 Subject: [PATCH 32/37] Fixes wallet page issues found on handheld devices --- _includes/layout/base/wallets-list.html | 7 +- _sass/_wallets.scss | 430 ++++++------------------ 2 files changed, 109 insertions(+), 328 deletions(-) diff --git a/_includes/layout/base/wallets-list.html b/_includes/layout/base/wallets-list.html index 350b2689..8c9bdc61 100644 --- a/_includes/layout/base/wallets-list.html +++ b/_includes/layout/base/wallets-list.html @@ -3,13 +3,14 @@ This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT. {% endcomment %} -
    +
    {% for wallet in site.wallets %} {% assign platform = page.platform['name'] %} {% assign os = page.os['name'] %} {% if wallet.compat contains platform and wallet.compat contains os %} -
    - +
    + {{ wallet.title }} {{ wallet.titleshort }} diff --git a/_sass/_wallets.scss b/_sass/_wallets.scss index b45a8309..bd83cd6b 100644 --- a/_sass/_wallets.scss +++ b/_sass/_wallets.scss @@ -1,231 +1,81 @@ -.wallets { - width: 705px; - height: 250px; - text-align: left; - position: relative; +$green: #329239; +$grey: #8b8b8b; +$red: #ee9209; +$blue: #2c6faf; +$dark-blue: #255f96; +$light-blue: #63a4e1; +$lightest-blue: #f0f8ff; + +@mixin button { + background-color: transparent; + font-weight: bold; + border: 1px solid $dark-blue; + margin-right: 10px; + text-decoration: none; + padding: 4px 8px; + border-radius: 4px; + text-align: center; + display: inline-block; + margin-bottom: 10px; +} + +@mixin active-button { + background-color: $blue; + background-image: -o-linear-gradient(bottom, $dark-blue 14%, $blue 70%); + background-image: -moz-linear-gradient(bottom, $dark-blue 14%, $blue 70%); + background-image: -webkit-linear-gradient(bottom, $dark-blue 14%, $blue 70%); + background-image: -ms-linear-gradient(bottom, $dark-blue 14%, $blue 70%); + background-image: linear-gradient(bottom, $dark-blue 14%, $blue 70%); + color: #fff; + + &:hover { + background-color: $light-blue; + background-image: none; + } +} + +.wallet-list { margin: auto; padding: 60px 0 20px 0; - font-size: 0; - opacity: 1; - -moz-transition: opacity 400ms ease-out; - -webkit-transition: opacity 400ms ease-out; - transition: opacity 400ms ease-out; -} -.wallets.disabled { - opacity: 0; -} -.wallets > div { - display: inline-block; - vertical-align: top; - font-size: 16px; -} -.wallets > div:nth-child(1n + 15) { - display: none; -} -.wallets > div > a { - color: #2c6fad; - cursor: pointer; - font-size: 94%; text-align: center; - text-decoration: none; - font-weight: bold; - width: 72px; - height: 110px; - display: inline-block; - vertical-align: top; - position: relative; - margin: 0 14px 20px 14px; - white-space: nowrap; - outline: 0; - -moz-transition: opacity 400ms ease-out; - -webkit-transition: opacity 400ms ease-out; - transition: opacity 400ms ease-out; -} -.wallets > div > a:hover { - color: #63a4e1; -} -.wallets > div > a > span { - display: none; - position: absolute; - z-index: 100; - height: 32px; - background: url(/img/icons/wallet_bubble.svg) no-repeat center 0; - top: 0; - left: 0; - right: 0; -} -.wallets > div > a > img { - display: block; - width: 72px; - height: 72px; - margin: auto; - margin-bottom: 5px; -} -.wallets > div > div, -.wallets > div > span { - opacity: 0; - width: 0; - height: 0; - overflow: hidden; - visibility: hidden; - display: inline-block; - position: absolute; - padding: 20px; - top: -382px; - left: -20px; - right: -20px; - -moz-transition: opacity 400ms ease-out; - -webkit-transition: opacity 400ms ease-out; - transition: opacity 400ms ease-out; -} -.wallets > div > span { - z-index: 100; - border: solid 2px #2c6faf; - background-color: #f1f8fb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.wallets > div > div { - z-index: 102; -} -.wallets > div:nth-child(1n + 7) > div, -.wallets > div:nth-child(1n + 7) > span { - top: -252px; -} -.wallets > div:nth-child(1n + 13) > div, -.wallets > div:nth-child(1n + 13) > span { - top: -92px; -} -.wallets > div > div > h2 { - margin: 0; - text-align: left; - display: inline-block; -} -.wallets > div > div > h2:first-child + div { - display: inline-block; - margin-left: 10px; -} -.wallets > div > div > h2:first-child + div > img { - margin-left: 4px; -} -.wallets > div > div > h2:first-child + div + div > a { - display: inline-block; - text-decoration: none; - margin: 10px 0; - padding: 4px 8px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.wallets > div > div > h2:first-child + div + div > a:first-child { - font-weight: bold; - background-color: #2c6fad; - background-image: -o-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image: -moz-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image: -webkit-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image: -ms-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image: linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - border: 1px solid #255f96; - margin-right: 10px; -} -.wallets > div > div > h2:first-child + div + div > a:first-child, -.wallets > div > div > h2:first-child + div + div > a:first-child:visited, -.wallets > div > div > h2:first-child + div + div > a:first-child:link, -.wallets > div > div > h2:first-child + div + div > a:first-child:active { - color: #fff; -} -.wallets > div > div > h2:first-child + div + div > a:first-child + a { - font-weight: normal; - color: #255f96; - border: 1px solid #255f96; -} -.wallets > div > div > h2:first-child + div + div > a:first-child + a, -.wallets > div > div > h2:first-child + div + div > a:first-child + a:visited, -.wallets > div > div > h2:first-child + div + div > a:first-child + a:link, -.wallets > div > div > h2:first-child + div + div > a:first-child + a:active { - color: #255f96; -} -.wallets > div > div > h2:first-child + div + div + div { - margin: 5px 0; -} -.wallets > div > div > h2:first-child + div + div + div > div { - padding: 5px 0 5px 22px; - background-repeat: no-repeat; - background-position: left 4px; - cursor: default; - line-height: 16px; -} -.wallets > div > div > h2:first-child + div + div + div > div > div { - display: inline-block; - background-image: url(/img/icons/wallet_help.png); - background-image: none, url(/img/icons/wallet_help.svg), url(/img/icons/wallet_help.png); - width: 16px; - height: 16px; - margin-left: 5px; - vertical-align: top; - position: relative; -} -.wallets > div > div > h2:first-child + div + div + div > div > div > span { - display: none; - position: absolute; - left: 6px; - top: -30px; - width: 25px; - height: 70px; - z-index: 90; - background-repeat: no-repeat; - background-position: right 30px; -} -.wallets > div > div > h2:first-child + div + div + div > div > div > p, -.wallets > div > div > h2:first-child + div + div + div > div > div > div { - opacity: 0; - width: 0; - height: 0; - overflow: hidden; - border: 1px solid; - visibility: hidden; - position: absolute; - background-color: #fff; - left: 30px; - margin: 0; - -moz-transition: opacity 400ms ease-out; - -webkit-transition: opacity 400ms ease-out; - transition: opacity 400ms ease-out; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - z-index: 90; -} -.wallets > div > div > h2:first-child + div + div + div > div > div > p { - font-size: 85%; - padding: 10px; - top: -30px; -} -.wallets > div > div > h2:first-child + div + div + div > div > div > div { - padding: 0 10px; - top: -80px; -} -.wallets > div > div > h2:first-child + div + div + div > div > div > div > div > p:first-child + p { - font-size: 85%; -} -.wallets > div > div > h2:first-child + div + div + div + p { - font-size: 95%; - margin: 0; - padding-right: 5px; - height: 137px; - width: 320px; - overflow: auto; -} -.wallets > div > div > h2:first-child + div + div + div + p + div { - position: absolute; - top: 20px; - right: 20px; - height: 400px; - width: 250px; -} -.wallets > div > div > h2:first-child + div + div + div + p + div > img { - border: 1px solid #BDBDBD; + + .wallet-list-item { + display: inline-block; + + .wallet-list-item-link { + color: $blue; + text-align: center; + text-decoration: none; + font-weight: bold; + width: 75px; + display: inline-block; + vertical-align: top; + margin: 0 14px 20px; + white-space: nowrap; + outline: 0; + + &:hover { + color: $light-blue; + + img { + opacity: 0.9; + } + } + + img { + display: block; + width: 72px; + height: 72px; + margin: auto; + margin-bottom: 5px; + transition: opacity .12s ease-in; + } + } + } + + &:nth-child(1n + 15) { + display: none; + } } // ----------------------------- new @@ -238,12 +88,6 @@ $checks: fees, privacy; -$green: #329239; -$grey: #8b8b8b; -$red: #ee9209; -$blue: #2c6faf; -$light-blue: #f0f8ff; - $scores: good $green bold, pass $green normal, @@ -272,27 +116,10 @@ $scores: margin-bottom: 20px; .wallet-os-btn { - background-color: transparent; - font-weight: bold; - border: 1px solid #255f96; - margin-right: 10px; - text-decoration: none; - padding: 4px 8px; - border-radius: 4px; - text-align: center; + @include button; &.active { - background-color: #2c6fad; - background-image: -o-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image: -moz-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image: -webkit-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image: -ms-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image: linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - color: #fff; - - &:hover { - background-image: none; - } + @include active-button; } span { @@ -302,12 +129,13 @@ $scores: } .wallet-os-container { - background-color: $light-blue; + background-color: $lightest-blue; padding: 20px; border: 2px solid $blue; border-radius: 4px; margin-bottom: 20px; display: flex; + flex-wrap: wrap; &.hidden { display: none; @@ -340,30 +168,11 @@ $scores: .wallet-os-source-link, .wallet-os-download-link { - font-weight: bold; - border: 1px solid #255f96; - margin-right: 10px; - text-decoration: none; - padding: 4px 8px; - border-radius: 4px; - text-align: center; + @include button; } .wallet-os-download-link { - background-color: #2c6fad; - background-image: -o-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image: -moz-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image: -webkit-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image: -ms-linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - background-image: linear-gradient(bottom, #255f96 14%, #2c6fad 70%); - color: #fff; - - &:hover { - background-image: none; - } - } - - .wallet-os-source-link { + @include active-button; } } @@ -385,25 +194,36 @@ $scores: cursor: pointer; } + .wallet-os-check-details { + max-height: 0px; + overflow: hidden; + background-color: #FFFFFF; + transition: all .24s ease-in; + font-size: 85%; + p { + margin: 0; + text-align: left; + } + } + .hover { .wallet-os-check-details { z-index: 100; - display: block; + max-height: 500px; border: 2px solid; border-radius: 4px; margin: 10px 0; padding: 10px; - } - } - .wallet-os-check-details { - display: none; - position: absolute; - background-color: #FFFFFF; - max-width: 350px; - p { - margin: 0; - text-align: left; + // This is for privacy checks + > div { + padding: 0; + + // This is the privacy check item title + &:first-child { + font-weight: bold; + } + } } } } @@ -415,7 +235,7 @@ $scores: @each $score, $color, $font-weight in $scores { .check#{$score} { background-repeat: no-repeat; - background-position-y: center; + background-position-y: 5px; padding-left: 25px; margin-bottom: 10px; @@ -450,50 +270,10 @@ $scores: } } -.wallets > div:hover > a > span, -.wallets > div.active > a > span, -.wallets.nohover > div.active:hover > a > span { - display: block; -} -.wallets.nohover > div:hover > a > span { - display: none; -} -.wallets > div:hover > div, -.wallets > div:hover > span, -.wallets > div.active > div, -.wallets > div.active > span, -.wallets.nohover > div.active:hover > div, -.wallets.nohover > div.active:hover > span { - opacity: 1; - width: auto; - height: 400px; - visibility: visible; - overflow: visible; -} -.wallets.nohover > div:hover > div, -.wallets.nohover > div:hover > span { - opacity: 0; - width: 0; - height: 0; - visibility: hidden; -} -.wallets > div > div > h2:first-child + div + div > a:first-child:hover { - background-image: none; -} -.wallets > div > div > h2:first-child + div + div + div > div:hover > div > span { - display: block; -} -.wallets > div > div > h2:first-child + div + div + div > div:hover > div > p, -.wallets > div > div > h2:first-child + div + div + div > div:hover > div > div { - opacity: 1; - width: 400px; - height: auto; - visibility: visible; -} - .walletsswitch { display: none; } + .walletsmobile { display: none; } From d0ada511d07802589461fa3ceeceb3b1e12ca0bf Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Wed, 19 Jul 2017 13:02:49 +0200 Subject: [PATCH 33/37] Fixes issues with wallet-menu on handheld devices --- _includes/layout/base/wallets-menu.html | 4 +- _sass/_wallets-menu.scss | 31 +++++ _sass/screen.scss | 152 ------------------------ js/main.js | 2 - 4 files changed, 33 insertions(+), 156 deletions(-) diff --git a/_includes/layout/base/wallets-menu.html b/_includes/layout/base/wallets-menu.html index 09faf299..26f13d83 100644 --- a/_includes/layout/base/wallets-menu.html +++ b/_includes/layout/base/wallets-menu.html @@ -28,10 +28,10 @@ http://opensource.org/licenses/MIT.
  • {% if platformName == 'hardware' or platformName == 'web' %} {% assign platformHref = "/" | append: page.lang | append: "/wallets/" | append: platformName | append: "/" | append: platformName | append: "/" %} + {% translate walletcat{{platformName}} choose-your-wallet %} {% else %} - {% assign platformHref = "#" %} + {% translate walletcat{{platformName}} choose-your-wallet %} {% endif %} - {% translate walletcat{{platformName}} choose-your-wallet %} {% if platform.items.size > 1 %}
      {% for item in platform.items %} diff --git a/_sass/_wallets-menu.scss b/_sass/_wallets-menu.scss index ea825b9d..fdb0641b 100644 --- a/_sass/_wallets-menu.scss +++ b/_sass/_wallets-menu.scss @@ -154,4 +154,35 @@ $oses: background-image: url('/img/os/wallet_menu_#{$os}.svg'); } } + + @media handheld, + only screen and ( max-width: 60em ), + only screen and ( max-device-width: 60em ) { + > ul { + display: block; + > li { + display: block; + margin-bottom: 25px; + border: 1px solid $dark-blue; + + &:first-child { + margin-left: 10px; + } + &:last-child { + margin-right: 10px; + } + + &.active { + ul { + display: block; + } + } + + ul { + min-width: 100%; + position: initial; + } + } + } + } } diff --git a/_sass/screen.scss b/_sass/screen.scss index aa92ebf7..cc104cef 100644 --- a/_sass/screen.scss +++ b/_sass/screen.scss @@ -2267,158 +2267,6 @@ h2 .rssicon{ padding:0; border:0; } - .walletmenu{ - -webkit-tap-highlight-color:rgba(0,0,0,0); - -webkit-tap-highlight-color:transparent; - } - .walletmenu>ul{ - display:block; - } - .walletmenu>ul li{ - display:block; - margin:15px 0; - } - .walletmenu>ul>li ul{ - position:relative; - min-width:0; - } - .walletmenu>ul.menutap li:hover{ - background-color:#fff; - } - .walletmenu>ul.menutap li:hover>a, - .walletmenu>ul.menutap li:hover>a:link, - .walletmenu>ul.menutap li:hover>a:active, - .walletmenu>ul.menutap li:hover>a:visited{ - color:#383838; - } - .walletmenu>ul.menutap>li:hover{ - background-position:left 6px; - } - .walletmenu>ul.menutap>li:hover>ul{ - display:none; - } - .walletmenu>ul.menutap>li>ul>li:hover{ - background-position:left 10px; - } - .walletmenu>ul.menutap li.active{ - background-color:#0d579b; - } - .walletmenu>ul.menutap li.active>a, - .walletmenu>ul.menutap li.active>a:link, - .walletmenu>ul.menutap li.active>a:active, - .walletmenu>ul.menutap li.active>a:visited{ - color:#fff; - } - .walletmenu>ul.menutap>li.active{ - background-position:left -62px; - } - .walletmenu>ul.menutap>li.active>ul{ - display:block; - } - .walletmenu>ul.menutap>li>ul>li.active{ - background-position:left -24px; - } - .wallets{ - width:auto; - height:auto; - -webkit-tap-highlight-color:rgba(0,0,0,0); - -webkit-tap-highlight-color:transparent; - } - .wallets>div:hover>span{ - display:none; - } - .wallets>div>div{ - border:solid 2px #2c6faf; - background-color:#f1f8fb; - -moz-transition:opacity 400ms ease-out; - -webkit-transition:opacity 400ms ease-out; - transition:opacity 400ms ease-out; - -webkit-border-radius:4px; - -moz-border-radius:4px; - border-radius:4px; - } - .wallets>div:hover>div{ - opacity:0; - width:0; - height:0; - visibility:hidden; - } - .wallets>div>a, - .wallets>div>a:visited, - .wallets>div>a:link, - .wallets>div>a:active{ - margin:0 13px 20px 13px; - } - .wallets>div:hover>a>span{ - display:none; - } - .wallets.walletsmobile{ - display:block; - padding:10px 0; - } - .wallets.walletsmobile>div>a{ - display:none; - } - .wallets.walletsmobile>div>div, - .wallets.walletsmobile>div:hover>div{ - display:block; - position:relative; - top:0; - left:0; - right:0; - padding:10px; - opacity:1; - width:auto; - height:auto; - visibility:visible; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div{ - padding:8px 0 8px 22px; - background-position:left 7px; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div+p{ - padding-right:5px; - height:auto; - width:auto; - overflow:visible; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div+p+div{ - position:static; - height:auto; - width:auto; - margin-top:10px; - padding:0; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div.hover>div{ - display:block; - background:none; - width:auto; - height:auto; - margin-left:0; - margin-top:10px; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div>div>p, - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div>div>div, - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div>div>span{ - display:none; - position:relative; - width:auto; - height:auto; - visibility:visible; - opacity:1; - border:0; - background:none; - padding:0; - top:0; - left:-20px; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div.hover>div>p, - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div.hover>div>div{ - display:block; - } - .wallets.walletsmobile>div>div>h2:first-child+div+div+div>div.hover>div>span{ - display:none; - } .download{ text-align:left; } diff --git a/js/main.js b/js/main.js index 4ed71b99..431ea59d 100644 --- a/js/main.js +++ b/js/main.js @@ -367,8 +367,6 @@ function walletMenuListener(e) { if (tt.nodeName === 'LI') addClass(tt, 'active'); tt = tt.parentNode; } - walletShowPlatform(t.getAttribute('data-walletcompat')); - if (isMobile() && !hasSubItems(t)) scrollToNode(document.getElementById('wallets')); }, hasSubItems = function(t) { while (t.nodeName !== 'LI') t = t.parentNode; From 694ae9e55696fd5581d2a7f9f41a50e4a22aeac4 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Wed, 19 Jul 2017 13:03:21 +0200 Subject: [PATCH 34/37] Updates check-for-empty-title-tag description --- Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index dff4c987..1c615563 100644 --- a/Makefile +++ b/Makefile @@ -184,9 +184,8 @@ check-for-headers-containing-auto-link: $S grep '<\(h[2-6]\).*\?>[^>]\+class="auto-link".*' _site/en/developer-* | eval $(ERROR_ON_OUTPUT) check-for-empty-title-tag: -## The autocrossref plugin can mess up subheadings (h2, etc), so ensure -## none of the generated subheadings contain the string -## 'class="auto-link"' produced by autocrossref +## This checks whether all generated pages have a title tag with +## content $S find ./_site -name '*.html' -type f \ | xargs grep '' \ | eval $(ERROR_ON_OUTPUT) @@ -198,13 +197,6 @@ check-for-missing-subhead-links: | egrep -v 'developer-documentation| - $S egrep -n -A1 ' Date: Wed, 19 Jul 2017 14:27:44 +0200 Subject: [PATCH 35/37] Fixes a bug with the transitions of the wallet listings --- js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/main.js b/js/main.js index 431ea59d..3d479d1f 100644 --- a/js/main.js +++ b/js/main.js @@ -359,7 +359,7 @@ function walletMenuListener(e) { var walletSelectPlatform = function(e) { var t = getEvent(e, 'target'), p = t; - if (t.nodeName !== 'A') return; + if (t.nodeName !== 'A' || t.getAttribute('href')) return; while (p.parentNode.nodeName === 'UL' || p.parentNode.nodeName === 'LI') p = p.parentNode; for (var i = 0, nds = p.getElementsByTagName('LI'), n = nds.length; i < n; i++) removeClass(nds[i], 'active'); var tt = t; From 87c970c7381def2d6bc194d23d75b4572fc6289d Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Fri, 28 Jul 2017 03:05:35 +0200 Subject: [PATCH 36/37] Updates documentation about adding a wallet --- docs/managing-wallets.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/managing-wallets.md b/docs/managing-wallets.md index d13a0cd4..95bd6e20 100644 --- a/docs/managing-wallets.md +++ b/docs/managing-wallets.md @@ -87,7 +87,7 @@ to request an exemption or policy change. Feel free to email Will Binns ([will@bitcoin.org](mailto:will@bitcoin.org)) or Dave Harding ([dave@dtrt.org](mailto:dave@dtrt.org)) if you have any questions. -Wallets can be added in `_templates/choose-your-wallet.html`. Entries are +Wallets can be added in `_wallets/[wallet_name].md`. Entries are ordered by levels and new wallets must be added after the last wallet on the same level. @@ -109,7 +109,7 @@ wallets' descriptions. ### Score Each wallet is assigned a score for five criteria. For each of them, the -appropriate text in `_translations/en.yml` needs to be chosen. +appropriate text in `_translations/en.yml` needs to be chosen (_see `choose-your-wallet` section_). **Control** - What control the user has over his bitcoins? From 2d52c622b4035b2f7d7031ca4e6c6b08959be216 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Fri, 28 Jul 2017 21:38:27 +0200 Subject: [PATCH 37/37] Updates wallets' management documentation This commit removes ordering instruction, as wallets are stored in individual files. Adds Level property description section to the "Adding a wallet" section. --- docs/managing-wallets.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/docs/managing-wallets.md b/docs/managing-wallets.md index 95bd6e20..4c816bb5 100644 --- a/docs/managing-wallets.md +++ b/docs/managing-wallets.md @@ -87,14 +87,11 @@ to request an exemption or policy change. Feel free to email Will Binns ([will@bitcoin.org](mailto:will@bitcoin.org)) or Dave Harding ([dave@dtrt.org](mailto:dave@dtrt.org)) if you have any questions. -Wallets can be added in `_wallets/[wallet_name].md`. Entries are -ordered by levels and new wallets must be added after the last wallet on the -same level. +Wallets can be added by creating a Markdown file with a wallet name +in a `_wallets` folder, like this: `_wallets/[wallet_name].md`. -* Level 1 - Full nodes -* Level 2 - SPV, Random servers -* Level 3 - Hybrid, Multisig wallets -* Level 4 - Web wallets +For examples refer to the existing wallet files or check +`quality-assurance/schemas/wallets.yaml` schema. **Screenshot**: The png files must go in `/img/screenshots`, be 250 X 350 px and optimized with `optipng -o7 file.png`. @@ -106,6 +103,14 @@ or 85 X 85 px for square icons. **Description**: The text must go in `_translations/en.yml` alongside other wallets' descriptions. +**Level**: Each wallet must have a level property assigned. A value must be in a range +between 1 and 4. Level represents a category of a wallet: + +* Level 1 - Full nodes +* Level 2 - SPV, Random servers +* Level 3 - Hybrid, Multisig wallets +* Level 4 - Web wallets + ### Score Each wallet is assigned a score for five criteria. For each of them, the