Merge branch 'master' into PHRAS-2628_toolbar-plugin_4.1

This commit is contained in:
Nicolas Maillat
2019-06-12 15:34:05 +02:00
committed by GitHub
5 changed files with 5 additions and 2 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1010 B

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1,5 +1,5 @@
[class^="icon-"], [class*=" icon-"] {
[class^="icon-"].icomoon, [class*=" icon-"].icomoon {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icomoon' !important;
speak: none;

View File

@@ -381,7 +381,10 @@
{% for choice in basket_element.getValidationDatas() %}
{% if basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or choice.getParticipant().getUser() == app.getAuthenticatedUser() %}
<tr>
<td> {{ choice.getParticipant().getUser().getDisplayName() }} </td>
<td style="position: relative">
<span class="feedback_user_name">{{ choice.getParticipant().getUser().getDisplayName() }}</span>
<span class="line_separator"></span>
</td>
<td>
{% if choice.getParticipant().getCanAgree() %}
{% if choice.getAgreement() == true %}