Skip to content

Commit

Permalink
chore: cleanup contribute + payout page
Browse files Browse the repository at this point in the history
  • Loading branch information
@thelostone-mc
thelostone-mc committed Aug 7, 2019
1 parent 5b18d75 commit f7cf201
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 93 deletions.
21 changes: 8 additions & 13 deletions app/assets/v2/css/base.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1030,32 +1030,27 @@ input.is-invalid {
}

.bounty_box {
border: 5px solid white;
box-shadow: 0px 0px 0px 3px #15003e;
width: 100%;
display: block;
padding: 30px 30px;
background-color: #15003e;
color: white;
background-color: white;
color: black;
text-decoration: none;
transition: all 100ms linear;
}

.bounty_box.disabled, .bounty_box.disabled:hover {
cursor: not-allowed;
background-color: #5f445b;
background-color: rgb(245, 245, 245);
text-decoration: none;
}

.bounty_box:hover {
background-color: #35305e;
text-decoration: none;
}

.bounty_box h5 {
color: white;
}

.bounty_box span {
color: white;
transition: box-shadow 100ms ease-out;
box-shadow: 0px 0px 0px 6px #15003e;
color: #000;
}

.morecontent span {
Expand Down
1 change: 1 addition & 0 deletions app/assets/v2/images/bounty/share.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/v2/images/hackathon/bot.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 12 additions & 47 deletions app/dashboard/templates/contribute_bounty.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,31 +47,25 @@
</div>
<div class="col offset-md-1 col-md-10 d-flex align-items-center justify-content-center" id="primary_form">
<div class="d-flex justify-content-center flex-column mt-5 w-100" id="primary_subform">
<div class="w-100 text-center">
<h3>{% trans "Contribute to Bounty" %}</h3>
<img src="{% static "v2/images/prime.png" %}">
</div>
{% include 'shared/network_status.html' %}
<div class="w-100">
<h4>{% trans "Option 1:" %}</h4>
<div class="w-100 text-center mb-5">
<h3 class="mb-4">{% trans "Contribute to Bounty" %}</h3>
<img src="{% static "v2/images/obiwan-bot.svg" %}" style="max-width: 15rem">
</div>
<div class="w-100 mt-2">
<a class="bounty_box" href="{{bounty.action_urls.increase}}">
<h5>{% trans "Fund this Bounty." %}</h5>
<span>
{% trans "Used to increase the financial compensation to the bounty hunter(s) who turn around this issue." %}
</span>
<h5>{% trans "Fund this Bounty." %}</h5>
<span>
{% trans "Used to increase the financial compensation to the bounty hunter(s) who turn around this issue." %}
</span>
</a>
</div>
<div class="w-100">
<h4>{% trans "Option 2:" %}</h4>
</div>
<h4 class="font-weight-bold py-4 mb-0">OR</h4>
<div class="w-100 mt-2">
<a class="bounty_box" href="{{bounty.action_urls.social_contribution}}">
<h5>{% trans "Promote this Bounty" %}</h5>
<span>
{% trans "Used to tell your network about this bounty; increasing the chance that it'll be turned around." %}
</span>
<h5>{% trans "Promote this Bounty" %}</h5>
<span>
{% trans "Used to tell your network about this bounty; increasing the chance that it'll be turned around." %}
</span>
</a>
</div>
</div>
Expand All @@ -86,33 +80,4 @@ <h5>{% trans "Promote this Bounty" %}</h5>
{% include 'shared/footer.html' %}
{% include 'shared/messages.html' %}
</body>
<style>
h4{
border-bottom: 1px solid black;
}
.bounty_box {
border: 5px solid white;
width: 100%;
display: block;
padding: 30px 30px;
background-color: #3f243b;
color: white;
text-decoration: none;
}
.bounty_box.disabled, .bounty_box.disabled:hover {
cursor: not-allowed;
background-color: #5f445b;
text-decoration: none;
}
.bounty_box:hover {
background-color: #2f142b;
text-decoration: none;
}
.bounty_box h5{
color: white;
}
.bounty_box span{
color: white;
}
</style>
</html>
88 changes: 56 additions & 32 deletions app/dashboard/templates/payout_bounty.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
<head>
{% include 'shared/head.html' %}
{% include 'shared/cards.html' %}
<style>
.bounty_box {
min-height: 8.5rem;
margin-top: 0.4rem;
}
</style>
</head>

<body class="interior {{ active }} g-font-muli">
Expand All @@ -42,46 +48,64 @@
<div class="row content">
<div class="col-12 body">
<div class="row font-smaller-2" id="form_container">
<div class="col offset-md-1 col-md-10 d-flex align-items-center justify-content-center" id="primary_form">
<div class="d-flex justify-content-center flex-column mt-5 w-100" id="primary_subform">
<div class="w-100 text-center">
<h3>{% trans "Payout Bounty" %}</h3>
<div class="row col offset-md-1 col-md-10 d-flex align-items-center justify-content-center" id="primary_form" style="max-width:80rem;">
<div class="col-12 text-center my-5 mb-md-4">
<h3 class="mt-4">{% trans "Let's Get This Bounty Paid Out" %}</h3>
<p class="font-title">Pick one of the two to get started</p>
</div>

<p class="font-title-lg text-center mt-4">{% trans "Option 1:" %}</p>
<div class="w-100 mt-2">
<a class="bounty_box {% if bounty.fulfillments.count == 0 %}disabled{% endif %}" href="{% if bounty.fulfillments.count > 0 %}{{ bounty.action_urls.accept }}{% else %}#{% endif %}">
<h5>{% trans "Basic Payout." %}</h5>
<span class="font-body">
{% trans "Used to accept a bounty hunter's submission. You currently have " %}{{bounty.fulfillments.count}} {% trans "submission" %}{{bounty.fulfillments.count | pluralize}}.
{% if bounty.fulfillments.count == 0 %}
{% trans "This option is currently disabled because you have no submissions." %}
{% elif bounty.fulfillments.count == 1 %}
{% trans "Accept it using this option." %}
{% else %}
{% trans "Accept one of them using this option." %}
{% endif %}
</span>
<div class="col-12 col-xl-6">
<div class="text-center">
<img src="{% static "v2/images/obiwan-bot.svg" %}" style="max-width:80rem; height: 10rem">
</div>
<a class="bounty_box text-center {% if bounty.fulfillments.count == 0 %}disabled{% endif %}"
href="{% if bounty.fulfillments.count > 0 %}{{ bounty.action_urls.accept }}{% else %}#{% endif %}">
<h5>{% trans "BASIC" %}</h5>
<p class="font-subheader mt-2 mb-0">
USED TO
<span class="font-weight-bold">ACCEPT + PAY</span>
CONTRIBUTOR AFTER SUBMISSION.
<br>
<span class="font-caption font-weight-semibold">
{% if bounty.fulfillments.count == 0 %}
This is enabled when only when a contributor has submitted work on the Gitcoin Bounty.
{% elif bounty.fulfillments.count == 1 %}
You've got 1 SUBMISSION. Give them kudos.
{% else %}
You've got {{bounty.fulfillments.count | pluralize}} submissions.
Click here to pay one of them out.
{% endif %}
</span>
</p>
</a>
</div>

<p class="font-title-lg text-center mt-4">{% trans "Option 2:" %}</p>
<div class="w-100 mt-2">
<a class="bounty_box" href="{{ bounty.action_urls.advanced_payout }}">
<h5>{% trans "Advanced Payout." %}</h5>
<span class="font-body">
{% trans "Used to skip the 'submission' step; or when multiple parties need to be paid out." %}
</span>
</a>
<div class="row btn-metamask mt-4 mx-1 py-3 br-2">
<i class="col-3 col-lg-2 fas fa-exclamation-triangle font-title-xl my-auto text-center"></i>
<p class="col-9 col-lg-10 pl-lg-0 font-body my-auto font-weight-semibold">
{% trans "To include crowdfunding as part of this payout, please use Basic Payout." %}
</p>
<div class="col-12 d-block d-xl-none text-center">
<h2 class="my-5">OR</h2>
</div>

<div class="col-12 col-xl-6">
<div class="text-center mt-xl-4 pt-xl-2">
<img src="{% static "v2/images/bounty/share.svg" %}" style="max-width:80rem; height: 14rem">
</div>
<div>
<a class="bounty_box text-center" href="{{ bounty.action_urls.advanced_payout }}">
<h5 class="mt-2">{% trans "ADVANCED" %}</h5>
<p class="font-subheader my-2">
USED TO PAY
<span class="font-weight-bold">MULTIPLE PARTIES</span>/
<span class="font-weight-bold">WITHOUT SUBMISSION</span>
</p>
</a>
</div>
<div class="row col-12 btn-metamask mt-4 mx-1 py-3 br-2">
<i class="col-3 col-lg-2 fas fa-exclamation-triangle font-title-xl my-auto text-center"></i>
<p class="col-9 col-lg-10 pl-lg-0 font-body my-auto font-weight-semibold">
{% trans "To include crowdfunding as part of this payout, please use Basic Payout." %}
</p>
</div>
</div>

</div>
</div>
</div>
</div>
Expand Down

0 comments on commit f7cf201

Please sign in to comment.