From a2e3804446e73a37b1e3a2b0011c0313e40e14a5 Mon Sep 17 00:00:00 2001 From: Owocki Date: Tue, 16 Apr 2019 18:13:05 +0200 Subject: [PATCH] fix for opera working in hackathon explorer --- app/assets/v2/css/base.css | 3 +++ app/assets/v2/css/bounty.css | 3 +++ app/assets/v2/js/pages/bounty_details.js | 5 ++++- app/assets/v2/js/shared.js | 2 +- app/retail/templates/shared/result.html | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index 1b63c60c8b8..3bcb8ac357a 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -381,6 +381,9 @@ p a { max-width: 50px; border-radius: 100%; } +.dashboard .body .avatar.Azure-Samples { + border-radius: 0%; +} .body .nonefound { margin-left: 100px; diff --git a/app/assets/v2/css/bounty.css b/app/assets/v2/css/bounty.css index e786b42c902..fb0e5d7cf5b 100644 --- a/app/assets/v2/css/bounty.css +++ b/app/assets/v2/css/bounty.css @@ -65,6 +65,9 @@ body { border-radius: 50px; margin-top: 0px; } +.bounty_details .avatar.Azure-Samples { + border-radius: 0px; +} #avatar_url .avatar { width: 80px; diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js index 1fda02a3c44..54fadb71bc4 100644 --- a/app/assets/v2/js/pages/bounty_details.js +++ b/app/assets/v2/js/pages/bounty_details.js @@ -114,7 +114,7 @@ var callbacks = { return [ 'amount', token_value_to_display(val) + ' ' + result['token_name'] ]; }, 'avatar_url': function(key, val, result) { - return [ 'avatar', '' ]; + return [ 'avatar', '' ]; }, 'issuer_avatar_url': function(key, val, result) { const username = result['bounty_owner_github_username'] ? result['bounty_owner_github_username'] : 'Self'; @@ -458,6 +458,9 @@ var isBountyOwner = function(result) { if (typeof web3 == 'undefined') { return false; } + if (typeof web3.coinbase == 'undefined') { + return false; + } if (typeof web3.eth.coinbase == 'undefined' || !web3.eth.coinbase) { return false; } diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js index be2a3279e60..1b99a7574c1 100644 --- a/app/assets/v2/js/shared.js +++ b/app/assets/v2/js/shared.js @@ -1221,7 +1221,7 @@ function renderBountyRowsFromResults(results, renderForExplorer) { } if (renderForExplorer) { - if (typeof web3 != 'undefined' && web3.eth.coinbase == result['bounty_owner_address']) { + if (typeof web3 != 'undefined' && typeof web3.eth != 'undefined' && web3.eth.coinbase == result['bounty_owner_address']) { result['my_bounty'] = 'mine'; } else if (result['fulfiller_address'] !== '0x0000000000000000000000000000000000000000') { result['my_bounty'] = '' + result['status'] + ''; diff --git a/app/retail/templates/shared/result.html b/app/retail/templates/shared/result.html index c1f01f78edb..b4c6749439b 100644 --- a/app/retail/templates/shared/result.html +++ b/app/retail/templates/shared/result.html @@ -4,7 +4,7 @@ [[if avatar_url]]
- +
[[else]]