Merge pull request #3921 from gitcoinco/fix/prof-popovers

fix popover in profiles w many data
gitcoinco · Mar 7, 2019 · 67bdaee · 67bdaee
2 parents 612e7ca + a39a224
commit 67bdaee
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
@@ -1051,7 +1051,7 @@ input.is-invalid {
   opacity: 0.5;
 }
 .rating span.checked label i,
-.rating span.checked ~ span label i 
+.rating span.checked ~ span label i
 {
   opacity: 1;
 }
@@ -1630,6 +1630,10 @@ div.busyOverlay {
   padding: 1.4em 1.3em 1.3em;
 }
 
+.big-popover {
+  max-width: 482px;
+}
+
 /* Custom icons */
 
 .g-icon {

diff --git a/app/dashboard/templates/profiles/organization.html b/app/dashboard/templates/profiles/organization.html
@@ -35,7 +35,7 @@
               {% endif %}
             {% endfor %}
             {% if works_with_org|length > 8 %}
-              <div href="" class="plus-img" data-container="body" data-toggle="popover" data-html="true" data-placement="bottom" data-trigger="hover click" data-content='{% for profile, num_times in works_with_org.items|slice:"5:" %}<a href="{% url "profile" profile %}"><img class="rounded-circle m-1" width="30" height="30" title="{{profile}}: {{ num_times }} times" src="{% avatar_url profile %}"/></a>{% endfor %}'><span>+{{works_with_org|length|add:"-8"}}</span></div>
+              <div href="" class="plus-img" data-container="body" data-toggle="popover" data-template='<div class="popover big-popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>' data-html="true" data-placement="bottom" data-trigger="hover click" data-content='{% for profile, num_times in works_with_org.items|slice:"5:" %}<a href="{% url "profile" profile %}"><img class="rounded-circle m-1" width="30" height="30" title="{{profile}}: {{ num_times }} times" src="{% avatar_url profile %}"/></a>{% endfor %}'><span>+{{works_with_org|length|add:"-8"}}</span></div>
             {% endif %}
           {% endif %}
         </li>

diff --git a/app/dashboard/templates/profiles/profile.html b/app/dashboard/templates/profiles/profile.html
@@ -117,7 +117,7 @@ <h1 class="profile-header__handle">
                                 {% endif %}
                               {% endfor %}
                               {% if works_with_collected|length > 5 %}
-                                <div href="" class="plus-img" data-container="body" data-toggle="popover" data-html="true" data-placement="bottom" data-trigger="hover click" data-content='{% for profile, num_times in works_with_collected.items %}<a href="{% url "profile" profile %}"><img class="rounded-circle m-1" width="30" height="30" title="{{profile}}: {{ num_times }} times" src="{% avatar_url profile %}"/></a>{% endfor %}'><span>+{{works_with_collected|length|add:"-5"}}</span></div>
+                                <div href="" class="plus-img" data-container="body" data-toggle="popover" data-template='<div class="popover big-popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>' data-html="true" data-placement="bottom" data-trigger="hover click" data-content='{% for profile, num_times in works_with_collected.items %}<a href="{% url "profile" profile %}"><img class="rounded-circle m-1" width="30" height="30" title="{{profile}}: {{ num_times }} times" src="{% avatar_url profile %}"/></a>{% endfor %}'><span>+{{works_with_collected|length|add:"-5"}}</span></div>
                               {% endif %}
                           {% endif %}
                         </li>
@@ -145,7 +145,7 @@ <h1 class="profile-header__handle">
                               {% endif %}
                             {% endfor %}
                             {% if works_with_funded|length > 5 %}
-                              <div href="" class="plus-img" data-container="body" data-toggle="popover" data-html="true" data-placement="bottom" data-trigger="hover click" data-content='{% for profile, num_times in works_with_funded.items %}<a href="{% url "profile" profile %}"><img class="rounded-circle m-1" width="30" height="30" title="{{profile}}: {{ num_times }} times" src="{% avatar_url profile %}"/></a>{% endfor %}'><span>+{{works_with_funded|length|add:"-5"}}</span></div>
+                              <div href="" class="plus-img" data-container="body" data-toggle="popover" data-template='<div class="popover big-popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>' data-html="true" data-placement="bottom" data-trigger="hover click" data-content='{% for profile, num_times in works_with_funded.items %}<a href="{% url "profile" profile %}"><img class="rounded-circle m-1" width="30" height="30" title="{{profile}}: {{ num_times }} times" src="{% avatar_url profile %}"/></a>{% endfor %}'><span>+{{works_with_funded|length|add:"-5"}}</span></div>
                             {% endif %}
                           {% endif %}
                         </li>

diff --git a/app/retail/templates/emails/funded_featured_bounty.html b/app/retail/templates/emails/funded_featured_bounty.html
@@ -34,7 +34,7 @@ <h1 style="margin-top: 50px;">{% trans "You've successfully funded a bounty!" %}
       <div style="text-align: center;">
         <span style="text-align: center; border-radius: 2px; margin: 4px; padding: 3px 6px; font-size: 11px; font-weight: 400; white-space: nowrap; background-color: #e7f0fa; color: var(--gc-blue);    display: inline-block;">
           <p style="font-size:15px;">
-            {{ bounty.value_in_eth|floatformat:-2 }}
+            {{ bounty.value_true }}
             <span>{{ bounty.token_name }}</span>
           </p style="font-size:15px;">
         </span>