Skip to content

Commit

Permalink
Typogrify all the things!
Browse files Browse the repository at this point in the history
  • Loading branch information
racheltstevens authored and harrislapiroff committed Aug 5, 2017
1 parent 27b4d89 commit b4bb854
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions blog/templates/blog/_about_author.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load wagtailcore_tags wagtailimages_tags %}
{% load wagtailcore_tags wagtailimages_tags typogrify_tags %}

{% if author.bio or author.photo %}
<div class="blog-about">
Expand All @@ -12,7 +12,7 @@ <h2 class="section-heading">
</a>
</h2>
{% if author.bio %}
{{ author.bio|richtext }}
{{ author.bio|richtext|typogrify }}
{% endif %}
</div>
{% endif %}
2 changes: 1 addition & 1 deletion blog/templates/blog/_about_org.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h2 class="section-heading">
</a>
</h2>
{% if organization.description %}
{{ organization.description|richtext }}
{{ organization.description|richtext|typogrify }}
{% endif %}
</div>
{% endif %}
2 changes: 1 addition & 1 deletion blog/templates/blog/_blog_details.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load wagtailcore_tags %}
{% load wagtailcore_tags typogrify_tags %}
<aside class="blog-details">
{% if page.author or page.organization %}
<div class="blog-details__summary">
Expand Down
4 changes: 2 additions & 2 deletions common/templates/common/_category_methodology.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load wagtailcore_tags render_as_template %}
{% load wagtailcore_tags render_as_template typogrify_tags %}

<div class="methodology">
{% if category.methodology %}
Expand All @@ -12,7 +12,7 @@ <h3 class="methodology__title">
</h3>
<div class="methodology__text">
{% with method=category.methodology %}
{% render_as_template method %}
{% filter typogrify %}{% render_as_template method %}{% endfilter %}
{% endwith %}
</div>
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions common/templates/common/_simple_page_body.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{% load wagtailcore_tags render_as_template %}
{% load wagtailcore_tags render_as_template typogrify_tags %}

<div class="simple-page">
<h1 class="heading-block heading-block--1">{{ page.title }}</h1>
<section class="stream-sections">
{% for block in page.body %}
{% if block.block_type == 'text' %}
<section>{% render_as_template block.value %}</section>
<section>{% filter typogrify %}{% render_as_template block.value %}{% endfilter %}</section>
{% else %}
<section>{% include_block block %}</section>
{% endif %}
Expand Down
6 changes: 3 additions & 3 deletions common/templates/common/category_page.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends layout_template %}

{% load common_tags wagtailcore_tags render_as_template %}
{% load common_tags wagtailcore_tags render_as_template typogrify_tags %}

{% block flex_class %}
flex-container--grow-3
Expand Down Expand Up @@ -28,14 +28,14 @@ <h3 class="category__name">
{% if fact.link_url %}
<li class="quickfacts__item">
<a class="quickfacts__link" href="{{ fact.link_url }}">
{% filter richtext_inline %}
{% filter richtext_inline|typogrify %}
{% render_as_template fact.body %}
{% endfilter %}
</a>
</li>
{% else %}
<li class="quickfacts__item">
{% filter richtext_inline %}
{% filter richtext_inline|typogrify %}
{% render_as_template fact.body %}
{% endfilter %}
</li>
Expand Down
5 changes: 2 additions & 3 deletions common/templates/common/info_footer.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{% load wagtailcore_tags wagtailimages_tags static %}
{% load wagtailsettings_tags %}
{% load wagtailcore_tags wagtailimages_tags wagtailsettings_tags static typogrify_tags %}
{% get_settings %}

{% with footer=settings.common.FooterSettings %}
<div class="info-footer">
<div class="info-footer__body">
{{ footer.body|richtext }}
{{ footer.body|richtext|typogrify }}
</div>

<div class="partner-logos">
Expand Down
4 changes: 2 additions & 2 deletions forms/templates/forms/form_page.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% extends template_name %}
{% load wagtailcore_tags %}
{% load wagtailcore_tags typogrify_tags %}

{% block main %}
<div class="form-page">
<h2 class="page-title">{{ page.title }}</h2>
{{ page.intro|richtext }}
{{ page.intro|richtext|typogrify }}
<form class="form-page__form" action="{% pageurl page %}" method="POST">
{% csrf_token %}
{{ form.as_p }}
Expand Down
4 changes: 2 additions & 2 deletions forms/templates/forms/form_page_landing.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% load wagtailcore_tags %}
{% load wagtailcore_tags typogrify_tags %}

{% block main %}
{{ page.thank_you_text|richtext }}
{{ page.thank_you_text|richtext|typogrify }}
{% endblock %}
4 changes: 2 additions & 2 deletions home/templates/home/_intro.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% load common_tags wagtailcore_tags %}
{% load common_tags wagtailcore_tags typogrify_tags %}
<div class="intro">
{{ text|richtext_inline }}
{{ text|richtext_inline|typogrify }}

{% if read_more %}
<a
Expand Down
13 changes: 7 additions & 6 deletions incident/templates/incident/_incident.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
teaser -- whether this is a short teaser of an incident (default: False)
{% endcomment %}

{% load wagtailcore_tags %}
{% load wagtailimages_tags %}
{% load wagtailcore_tags wagtailimages_tags typogrify_tags %}
{% load render_as_template %}

<article class="
Expand Down Expand Up @@ -66,15 +65,15 @@ <h2 class="incident__title">
{% if teaser %}
<section>
{% if incident.teaser %}
{{ incident.teaser|richtext }}
{{ incident.teaser|richtext|typogrify }}
{% else %}
{% include_block incident.body.0|truncatewords_html:20 %}
{% include_block incident.body.0|truncatewords_html:20|typogrify %}
{% endif %}
</section>
{% else %}
{% for block in incident.body %}
{% if block.block_type == 'rich_text' %}
<section>{% render_as_template block.value %}</section>
<section>{% filter typogrify %}{% render_as_template block.value %}{% endfilter %}</section>
{% else %}
<section>{% include_block block %}</section>
{% endif %}
Expand All @@ -90,7 +89,9 @@ <h2 class="incident__title">
<div class="incident__description">
{% for block in update.body %}
{% if block.block_type == 'rich_text' %}
<section>{% render_as_template block.value %}</section>
<section>
{% filter typogrify %}{% render_as_template block.value %}{% endfilter %}
</section>
{% else %}
<section>{% include_block block %}</section>
{% endif %}
Expand Down

0 comments on commit b4bb854

Please sign in to comment.