From e03aab09628e5cd7a5515639a8ccff29e80840ef Mon Sep 17 00:00:00 2001 From: Sam Cheng Hung Date: Thu, 24 May 2018 14:57:34 +0800 Subject: [PATCH 1/2] Adds faucet link --- src/js/services/bitcoincomService.js | 8 ++ src/sass/icons.scss | 5 ++ www/css/main.css | 3 + www/img/icon-faucet.svg | 120 +++++++++++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 www/img/icon-faucet.svg diff --git a/src/js/services/bitcoincomService.js b/src/js/services/bitcoincomService.js index 07e0d8aa4..6e73c5a0a 100644 --- a/src/js/services/bitcoincomService.js +++ b/src/js/services/bitcoincomService.js @@ -16,6 +16,13 @@ angular.module('copayApp.services').factory('bitcoincomService', function($http, credentials.BITPAY_API_URL = "https://bitpay.com"; }; + var faucetItem = { + name: 'faucet', + title: 'Free Bitcoin Cash', + icon: 'icon-faucet', + href: 'https://free.bitcoin.com/' + }; + var cashGamesItem = { name: 'games', title: 'Bitcoin Cash Games', @@ -70,6 +77,7 @@ angular.module('copayApp.services').factory('bitcoincomService', function($http, }; var register = function() { + nextStepsService.register(faucetItem); nextStepsService.register(cashGamesItem); nextStepsService.register(newsItem); nextStepsService.register(poolItem); diff --git a/src/sass/icons.scss b/src/sass/icons.scss index 9bb26919f..c5ba231a6 100644 --- a/src/sass/icons.scss +++ b/src/sass/icons.scss @@ -83,6 +83,11 @@ background-color: #1da1f2; background-size: 60%; } + + &.icon-faucet { + background-image: url('../img/icon-faucet.svg'); + background-size: 70%; + } } } diff --git a/www/css/main.css b/www/css/main.css index e68b0f6ee..3de6e99ac 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -10034,6 +10034,9 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm background-image: url("../img/icon-twitter-white.svg"); background-color: #1da1f2; background-size: 60%; } + .big-icon-svg.theme-circle > .bg.icon-faucet { + background-image: url("../img/icon-faucet.svg"); + background-size: 70%; } .big-icon-svg.theme-circle-services > .bg { border: 1px solid #191919; } .big-icon-svg.theme-circle-community > .bg { diff --git a/www/img/icon-faucet.svg b/www/img/icon-faucet.svg new file mode 100644 index 000000000..e2eb5beed --- /dev/null +++ b/www/img/icon-faucet.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 73944ea1266695cbdfe144a539b6d3a59cd7dda6 Mon Sep 17 00:00:00 2001 From: Sam Cheng Hung Date: Thu, 24 May 2018 16:35:37 +0800 Subject: [PATCH 2/2] Moves faucet link to the bottom, update buy.bitcoin.com icon style --- src/js/services/bitcoincomService.js | 24 ++++++++++++++++-------- src/js/services/pricechartService.js | 12 ------------ src/sass/icons.scss | 2 +- www/css/main.css | 2 +- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/js/services/bitcoincomService.js b/src/js/services/bitcoincomService.js index 6e73c5a0a..681ed8f4d 100644 --- a/src/js/services/bitcoincomService.js +++ b/src/js/services/bitcoincomService.js @@ -16,13 +16,6 @@ angular.module('copayApp.services').factory('bitcoincomService', function($http, credentials.BITPAY_API_URL = "https://bitpay.com"; }; - var faucetItem = { - name: 'faucet', - title: 'Free Bitcoin Cash', - icon: 'icon-faucet', - href: 'https://free.bitcoin.com/' - }; - var cashGamesItem = { name: 'games', title: 'Bitcoin Cash Games', @@ -51,6 +44,20 @@ angular.module('copayApp.services').factory('bitcoincomService', function($http, href: 'http://tools.bitcoin.com' }; + var priceChartItem = { + name: 'pricechart', + title: 'Bitcoin Price Charts', + icon: 'icon-chart', + sref: 'tabs.pricechart', + }; + + var faucetItem = { + name: 'faucet', + title: 'Free Bitcoin Cash', + icon: 'icon-faucet', + href: 'https://free.bitcoin.com/' + }; + var _getBitPay = function(endpoint) { return { method: 'GET', @@ -77,11 +84,12 @@ angular.module('copayApp.services').factory('bitcoincomService', function($http, }; var register = function() { - nextStepsService.register(faucetItem); nextStepsService.register(cashGamesItem); nextStepsService.register(newsItem); nextStepsService.register(poolItem); nextStepsService.register(toolsItem); + nextStepsService.register(priceChartItem); + nextStepsService.register(faucetItem); }; register(); diff --git a/src/js/services/pricechartService.js b/src/js/services/pricechartService.js index becb62ad5..7e4f27457 100644 --- a/src/js/services/pricechartService.js +++ b/src/js/services/pricechartService.js @@ -3,17 +3,5 @@ angular.module('copayApp.services').factory('pricechartService', function($http, var root = {}; var credentials = {}; - var nextStepItem = { - name: 'pricechart', - title: 'Bitcoin Price Charts', - icon: 'icon-chart', - sref: 'tabs.pricechart', - }; - - var register = function() { - nextStepsService.register(nextStepItem); - }; - - register(); return root; }); diff --git a/src/sass/icons.scss b/src/sass/icons.scss index c5ba231a6..4693025f6 100644 --- a/src/sass/icons.scss +++ b/src/sass/icons.scss @@ -69,7 +69,7 @@ } &.icon-buy-bitcoin2 { - background-color: #494949; + border: 1px solid #faba13; } &.icon-reddit-white { diff --git a/www/css/main.css b/www/css/main.css index 3de6e99ac..4e7faac0a 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -10025,7 +10025,7 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm .big-icon-svg.theme-circle > .bg.icon-shapeshift { background-color: #263e5c; } .big-icon-svg.theme-circle > .bg.icon-buy-bitcoin2 { - background-color: #494949; } + border: 1px solid #faba13; } .big-icon-svg.theme-circle > .bg.icon-reddit-white { background-image: url("../img/icon-reddit-white.svg"); background-color: #ff4500;