vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Email body spacing issue

Browse source
This commit is contained in:
Suraj Shetty 2021-01-21 15:33:12 +05:30
parent dff1a2adf3
commit 927b62f39e
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/email/email_body.py
View file

@ -357,7 +357,7 @@ def get_message_id():
def get_signature(email_account):
if email_account and email_account.add_signature and email_account.signature:
return "<br><br>" + email_account.signature
return "<br>" + email_account.signature
else:
return ""

8
frappe/public/scss/email.scss
View file

@ -150,7 +150,7 @@ hr {
}
.email-footer-container {
margin-top: 60px;
margin-top: 40px;
& > div:not(:last-child) {
margin-bottom: 5px;
@ -315,11 +315,11 @@ hr {
background-color: $orange-bg;
color: $orange-color;
font-weight: normal;
width: 28px;
height: 28px;
width: 40px;
height: 40px;
text-align: center;
vertical-align: middle;
line-height: 28px;
line-height: 40px;
font-size: 12px;
}

2
frappe/templates/emails/standard.html
View file

@ -37,7 +37,7 @@
<tr>
<td valign="top">
<p>{{ content }}</p>
<p>{{ signature }}</p>
<p class="signature">{{ signature }}</p>
</td>
</tr>
</table>

4
frappe/templates/includes/avatar_macro.html
View file

@ -1,17 +1,15 @@
{% macro avatar(user_id=None, css_style=None) %}
{% set user_info = frappe.utils.get_user_info_for_avatar(user_id) %}
<span class="avatar avatar-small" title="{{ user_info.name }}">
<span class="avatar avatar-small" title="{{ user_info.name }}" style="{{ css_style or '' }}">
{% if user_info.image %}
<img
class="avatar-frame standard-image"
src="{{ user_info.image }}"
style="{{ css_style }}"
title="{{ user_info.name }}">
</span>
{% else %}
<span
class="avatar-frame standard-image"
style="{{ css_style }}"
title="{{ user_info.name }}">
{{ user_info.name[:1] }}
</span>