From 88926998a8a11184fb45365b5243c5448aa9a61f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Thu, 4 Feb 2016 14:45:46 +0100 Subject: [PATCH 1/2] Use whitelabel routes for wl-specific requests --- js/components/whitelabel/wallet/constants/wallet_api_urls.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/components/whitelabel/wallet/constants/wallet_api_urls.js b/js/components/whitelabel/wallet/constants/wallet_api_urls.js index 8ad2eb81..48359949 100644 --- a/js/components/whitelabel/wallet/constants/wallet_api_urls.js +++ b/js/components/whitelabel/wallet/constants/wallet_api_urls.js @@ -17,7 +17,8 @@ function getWalletApiUrls(subdomain) { 'piece': walletConstants.walletApiEndpoint + subdomain + '/pieces/${piece_id}/', 'user': walletConstants.walletApiEndpoint + subdomain + '/users/' }; - } else if (subdomain === 'lumenus' || subdomain === '23vivi') { + } else if (subdomain === 'lumenus' || subdomain === '23vivi' || + subdomain === 'polline' || subdomain === 'artcity') { return { 'editions_list': walletConstants.walletApiEndpoint + 'markets/' + subdomain + '/pieces/${piece_id}/editions/', 'edition': walletConstants.walletApiEndpoint + 'markets/' + subdomain + '/editions/${bitcoin_id}/', From ac2319f2310160ea2e1b1fe062a71df744be1748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Thu, 4 Feb 2016 15:53:16 +0100 Subject: [PATCH 2/2] Cleanup styles for polline.ascribe.io --- .../wallet/polline/polline_custom_style.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sass/whitelabel/wallet/polline/polline_custom_style.scss b/sass/whitelabel/wallet/polline/polline_custom_style.scss index 4e912cb8..17cd4e68 100644 --- a/sass/whitelabel/wallet/polline/polline_custom_style.scss +++ b/sass/whitelabel/wallet/polline/polline_custom_style.scss @@ -171,13 +171,13 @@ $polline--highlight-color: #2882fa; fieldset[disabled] .btn-default.focus, fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default.active { - background-color: lighten($polline--highlight-color, 30%); - border-color: lighten($polline--highlight-color, 30%); + background-color: lighten($polline--button-default-color, 30%); + border-color: lighten($polline--button-default-color, 30%); } .btn-default { - background-color: $polline--highlight-color; - border-color: $polline--highlight-color; + background-color: $polline--button-default-color; + border-color: $polline--button-default-color; &:hover, &:active, @@ -188,8 +188,8 @@ $polline--highlight-color: #2882fa; &.active:hover, &.active:focus, &.active.focus { - background-color: lighten($polline--highlight-color, 30%); - border-color: lighten($polline--highlight-color, 30%); + background-color: lighten($polline--button-default-color, 30%); + border-color: lighten($polline--button-default-color, 30%); } }