From 4d46c557e48e2d310f903c0de7edc4e843d6127d Mon Sep 17 00:00:00 2001 From: Aditya Anand M C Date: Thu, 9 Jan 2020 12:13:52 +0530 Subject: [PATCH 1/2] bug: profile fix --- app/assets/v2/css/profile.css | 4 +++ .../templates/profiles/header_details.html | 30 ++++++++++++---- app/dashboard/templates/profiles/profile.html | 35 ++++++++----------- app/dashboard/templates/profiles/tabs.html | 1 + 4 files changed, 43 insertions(+), 27 deletions(-) diff --git a/app/assets/v2/css/profile.css b/app/assets/v2/css/profile.css index 4904cace64f..c204e69c239 100644 --- a/app/assets/v2/css/profile.css +++ b/app/assets/v2/css/profile.css @@ -73,6 +73,10 @@ font-size: 1.7rem; } +.profile-header__handle .quick-link { + top: -3px; +} + .profile-header__handle small { text-transform: none; } diff --git a/app/dashboard/templates/profiles/header_details.html b/app/dashboard/templates/profiles/header_details.html index 06343418b1f..18074470db7 100644 --- a/app/dashboard/templates/profiles/header_details.html +++ b/app/dashboard/templates/profiles/header_details.html @@ -2,22 +2,37 @@

{{ profile.name }} + {% if is_staff and not profile.is_org %} - + {% endif %} - + + - + + + {% if verification %} +

Gitcoin Verified

+

This contributor has completed the Gitcoin verification process, which means that the Gitcoin Core trusts their work.

+

Please note - use your judgement on whether this is the right contributor for your task.

' + > + + {% endif %} +

{{ profile.handle }} @@ -59,6 +74,7 @@

{{ profile.data.bio }} {% endif %} + {% if user.is_authenticated and is_on_tribe and profile.is_org %} {% elif user.is_authenticated and profile.is_org %} diff --git a/app/dashboard/templates/profiles/profile.html b/app/dashboard/templates/profiles/profile.html index 526543b1d57..2ae262c21af 100644 --- a/app/dashboard/templates/profiles/profile.html +++ b/app/dashboard/templates/profiles/profile.html @@ -46,8 +46,9 @@ {% endif %} +
-
+
{% if total_kudos_count %}
@@ -57,33 +58,27 @@
{% endif %} -
- {% if not hidden %} + {% if not hidden %} +
{% include 'profiles/header_avatar.html' %} {% include 'profiles/header_details.html' %} +
+ {% if profile.is_org %} + {% include 'profiles/organization.html' %} - {% if not hidden %} - {% if profile.is_org %} - {% include 'profiles/organization.html' %} - {% else %} - {% if profile.cascaded_persona == 'funder' %} - {% include 'profiles/scorecard_funder.html' %} - {% elif profile.cascaded_persona == 'hunter' %} - {% include 'profiles/scorecard_hunter.html' %} - {% else %} - {% include 'profiles/scorecard_hunter.html' %} - {% endif %} -
-
+ {% elif profile.cascaded_persona == 'funder' %} + {% include 'profiles/scorecard_funder.html' %} + + {% else %} + {% include 'profiles/scorecard_hunter.html' %} + {% endif %} {% endif %} - {% endif %} +
- {% endif%} - {% include 'profiles/tabs.html' %} + {% include 'profiles/tabs.html' %} -
{% if hidden %} {% include 'profiles/hidden.html' %} diff --git a/app/dashboard/templates/profiles/tabs.html b/app/dashboard/templates/profiles/tabs.html index d95ebf4703f..b40b5a71623 100644 --- a/app/dashboard/templates/profiles/tabs.html +++ b/app/dashboard/templates/profiles/tabs.html @@ -109,6 +109,7 @@ {% endif %}
+ {% endif %} From 9ecc58951d41220cedb272bb96aeb62fc4a6dd9e Mon Sep 17 00:00:00 2001 From: Aditya Anand M C Date: Thu, 9 Jan 2020 12:21:36 +0530 Subject: [PATCH 2/2] minor fixes --- app/assets/v2/css/profile.css | 20 ++- .../templates/profiles/header_details.html | 5 +- .../templates/profiles/status_box.html | 2 +- .../templates/profiles/tab_active.html | 8 +- .../profiles/tab_grant_contribs.html | 135 +++++++++--------- .../templates/profiles/tab_portfolio.html | 15 +- .../templates/profiles/tab_viewers.html | 22 +-- app/dashboard/templates/profiles/tabs.html | 2 +- 8 files changed, 117 insertions(+), 92 deletions(-) diff --git a/app/assets/v2/css/profile.css b/app/assets/v2/css/profile.css index c204e69c239..a7f9eb48260 100644 --- a/app/assets/v2/css/profile.css +++ b/app/assets/v2/css/profile.css @@ -18,7 +18,7 @@ background: #E8F0FA; padding: 4px; border-radius: 2px; - font-size: 12px; + font-size: 11px; color: #6487AE; display: inline-block; margin-bottom: 2px; @@ -219,8 +219,11 @@ display: none; } -} + .transaction-history.bounty_row .avatar { + max-width: 100% !important; + } +} .profile-header__stats { border: none; @@ -243,6 +246,19 @@ padding: 0.7rem; } + +.bounty_row { + border-bottom: 1px solid #EFEFEF; +} + +.bounty_row:hover { + background: none; +} + +#earn_dataviz { + max-width: 100%; +} + @media (min-width: 992px) and (max-width: 1199.98px) { .profile-header__stats .card-header { diff --git a/app/dashboard/templates/profiles/header_details.html b/app/dashboard/templates/profiles/header_details.html index 18074470db7..65d099dba77 100644 --- a/app/dashboard/templates/profiles/header_details.html +++ b/app/dashboard/templates/profiles/header_details.html @@ -20,7 +20,7 @@

- + {% if verification %} @@ -64,9 +64,6 @@

{% endif %} - {% if is_staff %} - - {% endif %}

{% if profile.data.bio %} diff --git a/app/dashboard/templates/profiles/status_box.html b/app/dashboard/templates/profiles/status_box.html index c0d1d3332f3..84795de235d 100644 --- a/app/dashboard/templates/profiles/status_box.html +++ b/app/dashboard/templates/profiles/status_box.html @@ -1,5 +1,5 @@ {% load static %} -
+
{% csrf_token %}