Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop

This commit is contained in:
Jim Blake 2014-08-13 15:23:27 -04:00
commit c1bb928096
2 changed files with 4 additions and 1 deletions

View file

@ -480,3 +480,6 @@ img.loading-addProfile,
img.loading-profileMyAccoount {
padding-left: 10px;
}
span.unlinkedAccount {
padding-left:24px;
}

View file

@ -154,7 +154,7 @@
<a ${disableDeleteAccount} href="${account.editUrl}" title="${strings.click_to_view_account}">${account.emailAddress}</a>
<!-- when this link is clicked, editAccount is noticed and all other fields are ignored. -->
<#else>
${account.emailAddress}
<span class="unlinkedAccount">${account.emailAddress}</span>
</#if>
</td>
<td>${account.firstName}</td>