diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index 6cccf55f70a..4a87b948d27 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -490,7 +490,7 @@ input[type=text].loading { } #primary_form { - max-width: 550px; + max-width: 550px; /* TODO: REMOVE */ margin: 0 auto; padding: 0 2em; } @@ -501,7 +501,8 @@ input[type=text].loading { } .submit_bounty #primary_form, -.fulfill_bounty #primary_form { +.fulfill_bounty #primary_form, +.increase_bounty #primary_form { max-width: none; } diff --git a/app/assets/v2/css/submit_bounty.css b/app/assets/v2/css/submit_bounty.css index e05744e1105..d6fdee8a53b 100644 --- a/app/assets/v2/css/submit_bounty.css +++ b/app/assets/v2/css/submit_bounty.css @@ -1,7 +1,8 @@ /* stylelint-disable selector-pseudo-class-no-unknown */ .submit_bounty .submit_bounty_content, -.fulfill_bounty .submit_bounty_content { +.fulfill_bounty .submit_bounty_content, +.increase_bounty .submit_bounty_content { background-color: #f2f6f9; } @@ -42,7 +43,7 @@ input:read-only { text-transform: none; } -#primary_form .font-subheader { +#primary_form #fee-section .font-subheader { color: #666666; font-weight: bold; } diff --git a/app/assets/v2/js/pages/increase_bounty.js b/app/assets/v2/js/pages/increase_bounty.js index 9b99128de73..f3367f7f032 100644 --- a/app/assets/v2/js/pages/increase_bounty.js +++ b/app/assets/v2/js/pages/increase_bounty.js @@ -59,7 +59,7 @@ $(document).ready(function() { e.preventDefault(); loading_button($(this)); - var issueURL = $('input[name=issueURL]').val(); + var issueURL = $('#issueURL').html(); var amount = $('input[name=amount]').val(); var tokenAddress = $('select[name=denomination]').val(); diff --git a/app/dashboard/templates/bounty/increase.html b/app/dashboard/templates/bounty/increase.html index b5d3cab31fe..6fdcce9813c 100644 --- a/app/dashboard/templates/bounty/increase.html +++ b/app/dashboard/templates/bounty/increase.html @@ -22,21 +22,16 @@ {% include 'shared/head.html' %} {% include 'shared/cards.html' %} - - + {% include 'shared/tag_manager_2.html' %}
{% include 'shared/top_nav.html' with class='d-md-flex' %} {% include 'shared/nav.html' %}
-
+
{% include 'shared/no_issue_error.html' with page='submit_bounty' %} @@ -48,110 +43,120 @@
{% include 'shared/success_container.html' %}
-
+
- - - -
-
-
-

Increase Funding

- -
- {% include 'shared/bounty_actions_hidden_vars.html' %} - {% include 'shared/network_status.html' %} -
- - -
-
- -
-
- -
-
-
- -
-
+ + + + + +
+
+
+

{% trans "Increase Bounty" %}

+

Contribute funds to increase the reward for this bounty!

+ + {% include 'shared/bounty_actions_hidden_vars.html' %} +
+ +

{{ bounty.title }}

- -
-
- {% include 'shared/wallet_estimate.html' %} -
- {% if FEE_PERCENTAGE != 0 %} -
-
{% trans "No Surprises" %}
-
-
-

- {% blocktrans %} - Simply pay the bounty amount ( plus a standard - 10% Gitcoin platform fee ). - This covers our costs for finding quality contributors to join our platform so that you get the best work. - If your business requires additional assistance, please contact us founders@gitcoin.co - {% endblocktrans %} -

+
+ +

{{ bounty.github_url }}

+
+
+
+
+ +
-
-
-

0 {{ bounty.token_name }}

-

- (10%) -

+
+ +
+
+
- {% endif %} -
-
-
{% trans "Total"%}
+
+ {% include 'shared/wallet_estimate.html' %}
-
-

{% trans "Payment Due = " %}

- -

- ( Increased Bounty 0 - {{ bounty.token_name }} + - - {% if FEE_PERCENTAGE == 0 %} - NO - {% else %} - 0 - {{ bounty.token_name }} - {% endif %} - Gitcoin Platform Fee ) -

-

- You will have to approve - - {% if FEE_PERCENTAGE == 0 %} 1 Metamask confirmation. {% else %} 2 Metamask confirmations.{% endif %} - -

+ {% if FEE_PERCENTAGE != 0 %} +
+
{% trans "No Surprises" %}
+
+
+

+ {% blocktrans %} + Simply pay the bounty amount ( plus a standard + 10% Gitcoin platform fee ). + This covers our costs for finding quality contributors to join our platform so that you get the best work. + If your business requires additional assistance, please contact us founders@gitcoin.co + {% endblocktrans %} +

+
+
+
+

0 {{ bounty.token_name }}

+

+ (10%) +

+
+
+
+
+ {% endif %} + +
+
+ + +
-
-
- - + +
+
+
+
{% trans "Total"%}
+
+
+

{% trans "Payment Due" %}

+ +

+ ( Increased Bounty Amount 0 + {{ bounty.token_name }} + + + {% if FEE_PERCENTAGE == 0 %} + + No Fees + {% else %} + + + 0 + {{ bounty.token_name }} + {% endif %} + Gitcoin Platform Fee ) +

+

+ You will have to approve + + {% if FEE_PERCENTAGE == 0 %} 1 Metamask confirmation. {% else %} 2 Metamask confirmations.{% endif %} + +

+
- -
- - Your transaction is secured by the audited StandardBounties contract on the Ethereum blockchain.
- Learn more here. - + +
+ +

+ Your transaction is secured by the audited StandardBounties contract on the Ethereum blockchain. + Learn more here. +

@@ -171,6 +176,9 @@
{% trans "Total"%}
diff --git a/app/dashboard/templates/shared/success_container.html b/app/dashboard/templates/shared/success_container.html index af84189098f..ee1d1839f7b 100644 --- a/app/dashboard/templates/shared/success_container.html +++ b/app/dashboard/templates/shared/success_container.html @@ -16,14 +16,15 @@ {% endcomment %} {% load i18n static %}