From 9b9b7732fd23319ea1f7bc8cc1add40c82a673d3 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sat, 31 Dec 2016 08:16:53 -0600 Subject: [PATCH 1/6] en: Add string for 'Vouchers' --- _translations/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_translations/en.yml b/_translations/en.yml index 73c85455..3a3df47c 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -703,6 +703,7 @@ en: news: "News" documentaries: "Documentaries" learn: "Learning resources" + vouchers: "Vouchers" secure-your-wallet: title: "Securing your wallet - Bitcoin" pagetitle: "Securing your wallet" From eb0cd45a87b5776466be27eef4cf76d9c415bdf8 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sat, 31 Dec 2016 08:23:38 -0600 Subject: [PATCH 2/6] resources: Add 'Vouchers', Consolidate 'Learn' --- _templates/resources.html | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/_templates/resources.html b/_templates/resources.html index e149f6d5..adc399c7 100644 --- a/_templates/resources.html +++ b/_templates/resources.html @@ -10,12 +10,17 @@ id: resources
-
-

Icon{% translate useful %}

+
+

Icon{% translate learn %}

{% translate linkwiki %}

WeUseCoins.com

BitcoinMining.com

-
+

Icon{% translate directories %}

{% translate linkwallets %} - bitcoin.org

{% translate linkmerchants %} - coinmap.org

@@ -38,7 +43,8 @@ id: resources

Bitcoin Magazine

CoinJournal

{% if page.lang == 'ru' %}

Биткойн Форум / Новости

{% else %}

BitcoinTalk press links

{% endif %} -
+
+

Icon{% translate charts %}

Blockchain.info

Biteasy.com

@@ -53,12 +59,12 @@ id: resources

BitcoinFilm.org

Ulterior States

The Bitcoin Phenomenon

-
+
+

Icon{% translate vouchers %}

+

Fold

+

Gyft

+

Opendime

-
+
\ No newline at end of file From 34b123639bf2f044f02b8665620236a834b6a9bd Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sat, 31 Dec 2016 08:28:28 -0600 Subject: [PATCH 3/6] icons: Add icons for vouchers --- img/icons/ico_voucher.png | Bin 0 -> 680 bytes img/icons/ico_voucher.svg | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100644 img/icons/ico_voucher.png create mode 100644 img/icons/ico_voucher.svg diff --git a/img/icons/ico_voucher.png b/img/icons/ico_voucher.png new file mode 100644 index 0000000000000000000000000000000000000000..3b97638b367dce863114c840ff0d8bf1dc71fe71 GIT binary patch literal 680 zcmV;Z0$2TsP)oGR6!KR@!xFLXd*^o5o3ZFR!ABP*+!y>R;IDo zPv8r7Zli^*c7lbK_yG*oBHCIAX(b8@g4ifANTML>=4D+Si(JVjX0!M1Zb;#Q(+p?k z|D2g~W+ucKZKvh7mHuA|2qBDw5GF$i*BZz3TL|2b3Xb3~j-v<9*968GyY49BGa?r8 z8V_*vpV%#c_a<2`<6O)5E&%hmj9EOx{Uq}%spfY8?!hH|!uQ_Z-Z(ls`YVCIK+l#4 zNWd48jDH{&3WYc`GZRatQXCi|?S}oS=^*BF2AN%_HB9^*#1SnW-s||f@Y%EqP zl{hps^mlBwD*_NOh1zBUHt^{*0@BpLO_Z=BMQo$JPZPAMfDpnNTt|OKIK1mfKnURg z9<~Wz(#Z~l5OR2eJ#D~Qsh5wbBAXQ6ZB1G(r7vK(tuDaXF2FCQzF*eChw-%o_%a@6 zy4oAydAvlu0|9f`*RFs&$@aAiU&N^_@EGHoFWCZqH!Ic_wurki#;MFR*VRB7-|#a- z=5@S6K5O>Py5JC|C2xHSucFuvyy;_P<vpW-e7o?b0vd#z#uqDB>w5SS9(4k5 zDIgJ1z|#$mWDa|`TtI`6t5!Q@0Vg|!XA+QzIEJ^l(G7TvQAifvHv0p%R;OFD#`fs| O0000 + + + + + + + From b3a691ab6ddcbda72e67911bf57686fd9c5d8339 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sat, 31 Dec 2016 08:44:40 -0600 Subject: [PATCH 4/6] en: Drop 'Useful places' string --- _translations/en.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/_translations/en.yml b/_translations/en.yml index 3a3df47c..e90822ff 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -690,7 +690,6 @@ en: title: "Resources - Bitcoin" pagetitle: "Bitcoin resources" pagedesc: "Find useful websites and resources about Bitcoin." - useful: "Useful places" linkwiki: "Bitcoin Wiki" linkcointelegraph: "CoinTelegraph" directories: "Directories" From 4b179968b444c831e711e226f3d05bb3378cf560 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sat, 31 Dec 2016 09:06:18 -0600 Subject: [PATCH 5/6] resources: Resolve issue with div spacing --- _templates/resources.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/_templates/resources.html b/_templates/resources.html index adc399c7..8db70839 100644 --- a/_templates/resources.html +++ b/_templates/resources.html @@ -19,8 +19,7 @@ id: resources

Bitcoin Knowledge Podcast

Khan Academy

IamSatoshi

- -
+

Icon{% translate directories %}

{% translate linkwallets %} - bitcoin.org

{% translate linkmerchants %} - coinmap.org

@@ -43,8 +42,7 @@ id: resources

Bitcoin Magazine

CoinJournal

{% if page.lang == 'ru' %}

Биткойн Форум / Новости

{% else %}

BitcoinTalk press links

{% endif %} -
-
+

Icon{% translate charts %}

Blockchain.info

Biteasy.com

@@ -59,8 +57,7 @@ id: resources

BitcoinFilm.org

Ulterior States

The Bitcoin Phenomenon

-
-
+

Icon{% translate vouchers %}

Fold

Gyft

From 8fb89a5bd7b06c45bca9f4317c87d23bb68b6800 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sat, 31 Dec 2016 09:07:55 -0600 Subject: [PATCH 6/6] resources: Reorder some of the learning resources --- _templates/resources.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_templates/resources.html b/_templates/resources.html index 8db70839..5fe27c45 100644 --- a/_templates/resources.html +++ b/_templates/resources.html @@ -13,11 +13,11 @@ id: resources

Icon{% translate directories %}