Skip to content

Merge develop into staging #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sahil28297 merged 3 commits into from
Feb 11, 2021
Merged

Merge develop into staging #555

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
523a4bb
fix: bloomstack branded header and footer removed and and company fie…
hitenshKharva Feb 11, 2021
6368ee0
Merge pull request #554 from hitenshKharva/quotation_authorize_button
hrwX Feb 11, 2021
a7cb385
Merge branch 'staging' into develop
sahil28297 Feb 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 1 addition & 36 deletions bloomstack_core/templates/emails/authorization_request.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,6 @@
<table
style="max-width: 600px; margin: 0 auto; font-family: Helvetica, 'sans-serif'; color: #808080; line-height: 24px;">

<thead style="background-color: #f7f7f7;">
<tr>
<td style="padding: 40px 20px">
<img src="https://gallery.mailchimp.com/8450e0cdfc0ece704a354070c/images/c93dc6dd-9e56-4435-ad7e-355038318242.png" alt="Logo" style="width: 40%; height: auto; float: left;">
<p style="float: right; padding-top: 25px; font-size: 21px; margin-bottom: 0;">
{% if authorization_request.status == "Request Sent" %}
Authorization Request
{% else %}
{{ authorization_request.linked_docname }}
{% endif %}
</p>
</td>
</tr>
</thead>

<tbody>
<tr>
<td>
Expand Down Expand Up @@ -88,34 +73,14 @@
</tr>
<tr>
<td>
<p style="margin: 0; padding-left: 20px; margin-bottom: 0!important;">Bloomstack Team</p>
<p style="margin: 0; padding-left: 20px; margin-bottom: 0!important;">{{ company }} Team</p>
</td>
</tr>
</table>
</td>
</tr>
</tbody>

<tfoot style="background-color: #4f5161; text-align: center;">
<tr>
<td style="padding: 50px 10px;">
<table style="width: 100%;">
<tr>
<td>
<p style="color: #fff; margin-bottom: 0!important;">Our support address is:</p>
</td>
</tr>
<tr>
<td>
<p style="margin: 0;"><a href="emailto:[email protected]"
style="color: #00ADD8">[email protected]</a></p>
</td>
</tr>
</table>
</td>
</tr>
</tfoot>

</table>

</body>
Expand Down