Skip to content

Commit

Permalink
fix for opera working in hackathon explorer
Browse files Browse the repository at this point in the history
  • Loading branch information
owocki committed Apr 16, 2019
1 parent 7e1c70b commit a2e3804
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 3 deletions.
3 changes: 3 additions & 0 deletions app/assets/v2/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions app/assets/v2/css/bounty.css
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ body {
border-radius: 50px;
margin-top: 0px;
}
.bounty_details .avatar.Azure-Samples {
border-radius: 0px;
}

#avatar_url .avatar {
width: 80px;
Expand Down
5 changes: 4 additions & 1 deletion app/assets/v2/js/pages/bounty_details.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ var callbacks = {
return [ 'amount', token_value_to_display(val) + ' ' + result['token_name'] ];
},
'avatar_url': function(key, val, result) {
return [ 'avatar', '<a href="/profile/' + result['org_name'] + '"><img class=avatar src="' + val + '"></a>' ];
return [ 'avatar', '<a href="/profile/' + result['org_name'] + '"><img class="avatar ' + result['github_org_name'] + '" src="' + val + '"></a>' ];
},
'issuer_avatar_url': function(key, val, result) {
const username = result['bounty_owner_github_username'] ? result['bounty_owner_github_username'] : 'Self';
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/v2/js/shared.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'] = '<a class="btn font-smaller-2 btn-sm btn-outline-dark" role="button" href="#">mine</span></a>';
} else if (result['fulfiller_address'] !== '0x0000000000000000000000000000000000000000') {
result['my_bounty'] = '<a class="btn font-smaller-2 btn-sm btn-outline-dark" role="button" href="#">' + result['status'] + '</span></a>';
Expand Down
2 changes: 1 addition & 1 deletion app/retail/templates/shared/result.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<a class="result bounty_row [[if hidden]]bounty_row--hidden[[/if]] [[:network]] i[[:standard_bounties_id]]" href="[[:action]]" data-container="body" data-toggle="popover" data-content='{% include "shared/bounty-popover.html" %}'>
[[if avatar_url]]
<div class="avatar-container col-1 justify-content-center hide_min_viewport">
<img src='[[:avatar_url]]' class='avatar'>
<img src='[[:avatar_url]]' class='avatar [[:github_org_name]]'>
</div>
[[else]]
<div class="avatar-container col-1 justify-content-center">
Expand Down

0 comments on commit a2e3804

Please sign in to comment.