From ac88b11a6ff25e4e4f595c945aaf069029c18ddc Mon Sep 17 00:00:00 2001 From: Deimos Date: Fri, 24 May 2019 18:36:10 -0600 Subject: [PATCH] Apply formatting for links/lists to wiki pages --- tildes/scss/modules/_text.scss | 4 ++++ tildes/tildes/templates/base.jinja2 | 2 +- tildes/tildes/templates/group_wiki_page.jinja2 | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tildes/scss/modules/_text.scss b/tildes/scss/modules/_text.scss index e5c4f2f..8b5d866 100644 --- a/tildes/scss/modules/_text.scss +++ b/tildes/scss/modules/_text.scss @@ -1,6 +1,10 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later +.text-formatted { + @extend %text-container; +} + .text-small { font-size: 0.6rem; line-height: 0.9rem; diff --git a/tildes/tildes/templates/base.jinja2 b/tildes/tildes/templates/base.jinja2 index d531c7c..de1e3c2 100644 --- a/tildes/tildes/templates/base.jinja2 +++ b/tildes/tildes/templates/base.jinja2 @@ -80,7 +80,7 @@ -
+
{# Only output the

tag if the main_heading block has some content #} {% set main_heading %}{% block main_heading %}{% endblock %}{% endset %} diff --git a/tildes/tildes/templates/group_wiki_page.jinja2 b/tildes/tildes/templates/group_wiki_page.jinja2 index d19dd12..810f67f 100644 --- a/tildes/tildes/templates/group_wiki_page.jinja2 +++ b/tildes/tildes/templates/group_wiki_page.jinja2 @@ -11,6 +11,8 @@ ~{{ page.group.path }} {% endblock %} +{% block main_classes %}text-formatted{% endblock %} + {% block main_heading %}{{ page.page_name }}{% endblock %} {% block content %}