Skip to content

Commit

Permalink
Merge pull request #5496 from thelostone-mc/bug
Browse files Browse the repository at this point in the history
bug: fixed wonky button
  • Loading branch information
thelostone-mc authored Nov 14, 2019
2 parents a4b0537 + b43f906 commit aa2c138
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 30 deletions.
10 changes: 0 additions & 10 deletions app/assets/v2/css/bounty.css
Original file line number Diff line number Diff line change
Expand Up @@ -410,16 +410,6 @@ a.btn {
margin-left: 5px;
}

#btn-white .github-comment {
color: #FFFFFF;
position: absolute;
font-size: 0.625rem;
text-align: center;
width: 1.25rem;
top: 0.4375rem;
right: 0.5rem;
}

.activity {
margin-bottom: 10px;
}
Expand Down
1 change: 0 additions & 1 deletion app/assets/v2/images/comment.svg

This file was deleted.

4 changes: 1 addition & 3 deletions app/assets/v2/js/pages/bounty_details.js
Original file line number Diff line number Diff line change
Expand Up @@ -1247,9 +1247,7 @@ var do_actions = function(result) {
text: (result['repo_type'] === 'private' ? '<i class="fas fa-lock mr-2"></i> ' +
gettext('Private Repo') : '<i class="fab fa-github mr-2"></i>' + gettext('View On Github')),
parent: 'github_actions',
title: gettext('View issue details and comments on Github'),
comments: result['github_comments'],
color: 'comments'
title: gettext('View issue details and comments on Github')
};

actions.push(_entry);
Expand Down
16 changes: 0 additions & 16 deletions app/dashboard/templates/bounty/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -262,22 +262,6 @@ <h5 class="bounty-heading">{% trans "Funder" %}</h5>
<a class="button button--primary accept [[if !enabled]]disabled[[/if]]" role="button" href="[[:href]]" target="[[:target]]">
<span class="font-caption">[[:text]] ( [[:pending_acceptance]] )</span>
</a>
[[else color == 'comments']]
<a class="button button--secondary mr-2 font-caption" role="button" target="_blank" href="[[:href]]" target="[[:target]]">
[[if comments]]
<span class="font-caption d-inline-flex">
[[:text]]
<span class="comment">
<img src={% static "v2/images/comment.svg" alt="Comment" %}>
<span class="github-comment">
[[:comments]]
</span>
</span>
</span>
[[else]]
<span class="font-caption">[[:text]]</span>
[[/if]]
</a>
[[else]]
<a class="button [[if primary]]button--primary[[else]]button--secondary[[/if]] mr-2 font-caption [[if !enabled]]disabled[[/if]] [[:buttonclass]]" role="button" href="[[:href]]" target="[[:target]]" [[if modal]] data-toggle="modal" data-target=".share-modal" [[/if]]>
<span class="font-caption">[[:text]]</span>
Expand Down

0 comments on commit aa2c138

Please sign in to comment.