don’t wrap markdown in <p> tags

This commit is contained in:
Andy Miller
2018-01-09 16:02:55 -07:00
parent 1ae8f5d308
commit 5fa25ec363

View File

@@ -28,15 +28,15 @@
{% block label %}
{% if field.help %}
{% if field.markdown %}
<span class="hint--bottom" data-hint="{{ field.help|tu|markdown|e('html') }}">{{ field.label|tu|markdown|raw }}</span>
<span class="hint--bottom" data-hint="{{ field.help|tu|markdown(false)|e('html') }}">{{ field.label|tu|markdown(false)|raw }}</span>
{% else %}
<span class="hint--bottom" data-hint="{{ field.help|tu|e('html') }}">{{ field.label|tu|raw }}</span>
{% endif %}
{% else %}
{% if field.markdown %}
{{ field.label|tu|raw }}
{{ field.label|tu|markdown(false)|raw }}
{% else %}
{{ field.label|tu|markdown|raw }}
{{ field.label|tu|raw }}
{% endif %}
{% endif %}
{{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
@@ -44,7 +44,11 @@
</label>
{% if field.sublabel %}
<div class="form-sublabel">
{{ field.sublabel|tu|markdown|raw }}
{% if field.markdown %}
{{ field.sublabel|tu|markdown(false)|raw }}
{% else %}
{{ field.sublabel|tu|raw }}
{% endif %}
</div>
{% endif %}
</div>
@@ -91,7 +95,7 @@
<div class="form-extra-wrapper {{ field.size }} {{ field.wrapper_classes }}">
<span class="form-description">
{% if field.markdown %}
{{ field.description|tu|markdown|raw }}
{{ field.description|tu|markdown(false)|raw }}
{% else %}
{{ field.description|tu|raw }}
{% endif %}