From 1c8230b2c426127fe3f958a31a9d362e19eae2a9 Mon Sep 17 00:00:00 2001 From: Aditya Anand M C Date: Wed, 7 Aug 2019 00:51:51 +0530 Subject: [PATCH] chore: cleanup contribute + payout page --- app/assets/v2/css/base.css | 21 ++--- app/assets/v2/images/bounty/share.svg | 1 + app/assets/v2/images/hackathon/bot.svg | 2 +- .../templates/contribute_bounty.html | 59 +++---------- app/dashboard/templates/payout_bounty.html | 88 ++++++++++++------- 5 files changed, 78 insertions(+), 93 deletions(-) create mode 100644 app/assets/v2/images/bounty/share.svg diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index 6c9b3a6f949..14e153a9175 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -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 { diff --git a/app/assets/v2/images/bounty/share.svg b/app/assets/v2/images/bounty/share.svg new file mode 100644 index 00000000000..3560ecd25f8 --- /dev/null +++ b/app/assets/v2/images/bounty/share.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/v2/images/hackathon/bot.svg b/app/assets/v2/images/hackathon/bot.svg index 0e541e4f4b3..291e3f996a8 100644 --- a/app/assets/v2/images/hackathon/bot.svg +++ b/app/assets/v2/images/hackathon/bot.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/app/dashboard/templates/contribute_bounty.html b/app/dashboard/templates/contribute_bounty.html index e91113d375e..da6538c5bc2 100644 --- a/app/dashboard/templates/contribute_bounty.html +++ b/app/dashboard/templates/contribute_bounty.html @@ -47,31 +47,25 @@
-
-

{% trans "Contribute to Bounty" %}

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

{% trans "Option 1:" %}

+
+

{% trans "Contribute to Bounty" %}

+
-
{% trans "Fund this Bounty." %}
- - {% trans "Used to increase the financial compensation to the bounty hunter(s) who turn around this issue." %} - +
{% trans "Fund this Bounty." %}
+ + {% trans "Used to increase the financial compensation to the bounty hunter(s) who turn around this issue." %} +
-
-

{% trans "Option 2:" %}

-
+

OR

-
{% trans "Promote this Bounty" %}
- - {% trans "Used to tell your network about this bounty; increasing the chance that it'll be turned around." %} - +
{% trans "Promote this Bounty" %}
+ + {% trans "Used to tell your network about this bounty; increasing the chance that it'll be turned around." %} +
@@ -86,33 +80,4 @@
{% trans "Promote this Bounty" %}
{% include 'shared/footer.html' %} {% include 'shared/messages.html' %} - diff --git a/app/dashboard/templates/payout_bounty.html b/app/dashboard/templates/payout_bounty.html index a7901c70b0c..7ecc95a6129 100644 --- a/app/dashboard/templates/payout_bounty.html +++ b/app/dashboard/templates/payout_bounty.html @@ -20,6 +20,12 @@ {% include 'shared/head.html' %} {% include 'shared/cards.html' %} + @@ -42,46 +48,64 @@
-
-
-
-

{% trans "Payout Bounty" %}

+
+
+

{% trans "Let's Get This Bounty Paid Out" %}

+

Pick one of the two to get started

-

{% trans "Option 1:" %}

-
- -
{% trans "Basic Payout." %}
- - {% 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 %} - +
+
+ +
+ +
{% trans "BASIC" %}
+

+ USED TO + ACCEPT + PAY + CONTRIBUTOR AFTER SUBMISSION. +
+ + {% 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 %} + +

-

{% trans "Option 2:" %}

-
- -
{% trans "Advanced Payout." %}
- - {% trans "Used to skip the 'submission' step; or when multiple parties need to be paid out." %} - - -
- -

- {% trans "To include crowdfunding as part of this payout, please use Basic Payout." %} -

+
+

OR

+
+ +
+
+ +
+ +
+ +

+ {% trans "To include crowdfunding as part of this payout, please use Basic Payout." %} +

+
-