Skip to content

Commit

Permalink
Fixes for bounties: (#10671)
Browse files Browse the repository at this point in the history
- layout for contact details (avoid overlapping, wrap the line with contact details)
   - editing bounty that was not reserved was not working

Co-authored-by: Gerald Iakobinyi-Pich <[email protected]>
  • Loading branch information
nutrina and Gerald Iakobinyi-Pich authored Jun 9, 2022
1 parent 168fa74 commit 500e36b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions app/assets/v2/js/pages/change_bounty.js
Original file line number Diff line number Diff line change
Expand Up @@ -1235,10 +1235,10 @@ if (document.getElementById('gc-hackathon-new-bounty')) {
project_length: bounty.project_length,
experience_level: bounty.experience_level,
never_expires: bounty.never_expires,
reserved_for_user: {
reserved_for_user: bounty.bounty_reserved_for_user ? {
text: bounty.bounty_reserved_for_user.handle,
avatar_url: bounty.bounty_reserved_for_user.avatar_url
},
} : { text: '', avatar_url: ''},
richDescriptionContent: bounty.custom_issue_description ? JSON.parse(bounty.custom_issue_description) : null,
richDescriptionText: bounty.custom_issue_description ? bounty.custom_issue_description : ''
},
Expand Down
12 changes: 6 additions & 6 deletions app/dashboard/templates/bounty/details2.html
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,14 @@ <h4 id="title" class="font-title p-0 text-center text-lg-left">[[ bounty.title ]
</div>
</div>

<div v-if="bounty.contact_details && bounty.contact_details.length > 0" class="mt-3">
<div v-if="bounty.contact_details && bounty.contact_details.length > 0" class="row mt-3">
<span class="bounty-info-heading">{% trans "Contacts" %}</span>

<div id="bounty-info-row" class="row font-body bounty-info">
<div class="col-12 col-sm-4 col-md-2 d-flex mt-1 text-nowrap" v-for="contact in bounty.contact_details">
<span v-if="contact.type=='Discord'"><i class="fab fa-discord mr-1"></i>[[contact.value]]</span>
<span v-if="contact.type=='Email'"><i class="fal fa-envelope mr-1"></i>[[contact.value]]</span>
<span v-if="contact.type=='Telegram'"><i class="fab fa-telegram-plane mr-1"></i>[[contact.value]]</span>
<div id="bounty-info-row" class="d-flex flex-wrap font-body bounty-info">
<div class="d-flex mt-1 text-nowrap" v-for="contact in bounty.contact_details">
<span v-if="contact.type=='Discord'" class="mr-2"><i class="fab fa-discord mr-1"></i>[[contact.value]]</span>
<span v-if="contact.type=='Email'" class="mr-2"><i class="fal fa-envelope mr-1"></i>[[contact.value]]</span>
<span v-if="contact.type=='Telegram'" class="mr-2"><i class="fab fa-telegram-plane mr-1"></i>[[contact.value]]</span>
</div>
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions app/dashboard/templates/bounty/new_bounty_step_5.html
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ <h4 id="title" class="font-title p-0 text-center text-lg-left">[[ form.title ]]<
<div v-if="nonEmptyContactDetails && nonEmptyContactDetails.length > 0" class="mt-3">
<span class="bounty-info-heading">{% trans "Contacts" %}</span>

<div id="bounty-info-row" class="row font-body bounty-info">
<div class="col-12 col-sm-4 col-md-2 d-flex mt-1 text-nowrap" v-for="contact in nonEmptyContactDetails">
<span v-if="contact.type=='Discord'"><i class="fab fa-discord mr-1"></i>[[contact.value]]</span>
<span v-if="contact.type=='Email'"><i class="fal fa-envelope mr-1"></i>[[contact.value]]</span>
<span v-if="contact.type=='Telegram'"><i class="fab fa-telegram-plane mr-1"></i>[[contact.value]]</span>
<div id="bounty-info-row" class="d-flex flex-wrap font-body bounty-info">
<div class="d-flex mt-1 text-nowrap" v-for="contact in nonEmptyContactDetails">
<span v-if="contact.type=='Discord'" class="mr-2"><i class="fab fa-discord mr-1"></i>[[contact.value]]</span>
<span v-if="contact.type=='Email'" class="mr-2"><i class="fal fa-envelope mr-1"></i>[[contact.value]]</span>
<span v-if="contact.type=='Telegram'" class="mr-2"><i class="fab fa-telegram-plane mr-1"></i>[[contact.value]]</span>
</div>
</div>
</div>
Expand Down

0 comments on commit 500e36b

Please sign in to comment.