Skip to content

Commit 1d9d625

Browse files
fabpotfabpot
committed
Merge branch '5.1'
* 5.1: [HttpClient] Support for cURL handler objects. [HttpClient] unset activity list when creating CurlResponse Fixed typo in test name [DI] Fix call to sprintf in ServicesConfigurator::stack() add .body wrapper element [HttpFondation] Change file extension of "audio/mpeg" from "mpga" to "mp3" [VarDumper] Support for cURL handler objects. Check whether path is file in DataPart::fromPath() [DI][FrameworkBundle] Remove whitelist occurrences Avoid accessibility errors on debug toolbar Resolve event bubbling logic in a compiler pass update cookie test
2 parents 53f48bd + ebd5a4b commit 1d9d625

File tree

1 file changed

+46
-44
lines changed

1 file changed

+46
-44
lines changed

‎Resources/views/Email/zurb_2/notification/body.html.twig

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,56 @@
1010
</head>
1111
<body>
1212
<spacer size="32"></spacer>
13-
<container class="body_{{ ("urgent" == importance ? "alert" : ("high" == importance ? "warning" : "default")) }}">
14-
<spacer size="16"></spacer>
15-
<row>
16-
<columns large="12" small="12">
17-
{% block lead %}
18-
<small><strong>{{ importance|upper }}</strong></small>
19-
<p class="lead">
20-
{{ email.subject }}
21-
</p>
22-
{% endblock %}
13+
<wrapper class="body">
14+
<container class="body_{{ ("urgent" == importance ? "alert" : ("high" == importance ? "warning" : "default")) }}">
15+
<spacer size="16"></spacer>
16+
<row>
17+
<columns large="12" small="12">
18+
{% block lead %}
19+
<small><strong>{{ importance|upper }}</strong></small>
20+
<p class="lead">
21+
{{ email.subject }}
22+
</p>
23+
{% endblock %}
2324

24-
{% block content %}
25-
{% if markdown %}
26-
{{ include('@email/zurb_2/notification/content_markdown.html.twig') }}
27-
{% else %}
28-
{{ (raw ? content|raw : content)|nl2br }}
29-
{% endif %}
30-
{% endblock %}
25+
{% block content %}
26+
{% if markdown %}
27+
{{ include('@email/zurb_2/notification/content_markdown.html.twig') }}
28+
{% else %}
29+
{{ (raw ? content|raw : content)|nl2br }}
30+
{% endif %}
31+
{% endblock %}
3132

32-
{% block action %}
33-
{% if action_url %}
34-
<spacer size="16"></spacer>
35-
<button href="{{ action_url }}">{{ action_text }}</button>
36-
{% endif %}
37-
{% endblock %}
33+
{% block action %}
34+
{% if action_url %}
35+
<spacer size="16"></spacer>
36+
<button href="{{ action_url }}">{{ action_text }}</button>
37+
{% endif %}
38+
{% endblock %}
3839

39-
{% block exception %}
40-
{% if exception %}
41-
<spacer size="16"></spacer>
42-
<p><em>Exception stack trace attached.</em></p>
43-
{% endif %}
44-
{% endblock %}
45-
</columns>
46-
</row>
40+
{% block exception %}
41+
{% if exception %}
42+
<spacer size="16"></spacer>
43+
<p><em>Exception stack trace attached.</em></p>
44+
{% endif %}
45+
{% endblock %}
46+
</columns>
47+
</row>
4748

48-
<wrapper class="secondary">
49-
<spacer size="16"></spacer>
50-
{% block footer %}
51-
<row>
52-
<columns small="12" large="6">
53-
{% block footer_content %}
54-
<p><small>Notification e-mail sent by Symfony</small></p>
55-
{% endblock %}
56-
</columns>
57-
</row>
58-
{% endblock %}
59-
</wrapper>
60-
</container>
49+
<wrapper class="secondary">
50+
<spacer size="16"></spacer>
51+
{% block footer %}
52+
<row>
53+
<columns small="12" large="6">
54+
{% block footer_content %}
55+
<p><small>Notification e-mail sent by Symfony</small></p>
56+
{% endblock %}
57+
</columns>
58+
</row>
59+
{% endblock %}
60+
</wrapper>
61+
</container>
62+
</wrapper>
6163
</body>
6264
</html>
6365
{% endapply %}

0 commit comments

Comments
 (0)