diff --git a/r2/r2/lib/pages/wiki.py b/r2/r2/lib/pages/wiki.py
index 26155d8aa..c1fbfdff0 100644
--- a/r2/r2/lib/pages/wiki.py
+++ b/r2/r2/lib/pages/wiki.py
@@ -131,13 +131,14 @@ class WikiListing(WikiBase):
def __init__(self, pages, **context):
content = WikiPageListing(pages)
context['wikiaction'] = ('pages', _("Viewing pages for /r/%s") % c.wiki_id)
- WikiBase.__init__(self, content, showtitle=True, **context)
+ description = [_("Below is a list of pages in this wiki visible to you in this subreddit.")]
+ WikiBase.__init__(self, content, description=description, showtitle=True, **context)
class WikiDiscussions(WikiBase):
def __init__(self, listing, **context):
content = WikiPageDiscussions(listing)
context['wikiaction'] = ('discussions', _("discussions"))
- description = _("Discussions are site-wide links to this wiki page.
\
- Submit a link to this wiki page or see other discussions about this wiki page.")
+ description = [_("Discussions are site-wide links to this wiki page."),
+ _("Submit a link to this wiki page or see other discussions about this wiki page.")]
WikiBase.__init__(self, content, description=description, **context)
diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css
index c569b1ee1..7501c5410 100755
--- a/r2/r2/public/static/css/reddit.css
+++ b/r2/r2/public/static/css/reddit.css
@@ -945,6 +945,21 @@ a.author { margin-right: 0.5em; }
margin: 15px;
}
+.wiki-page-content .pagelisting {
+ font-size: 1.2em;
+ font-weight: bold;
+ color: black;
+ padding-left: 25px;
+}
+
+.wiki-page-content .description h2 {
+ color: #222;
+}
+
+.wiki-page-content .description {
+ padding-bottom: 5px;
+}
+
.wikirevisionlisting .generic-table {
width: 100%;
}
@@ -981,6 +996,7 @@ a.author { margin-right: 0.5em; }
display: inline-block;
margin-left: 15px;
padding-right: 50px;
+ margin-top: 5px;
}
.discussionlink a {
diff --git a/r2/r2/templates/wikibasepage.html b/r2/r2/templates/wikibasepage.html
index 0f7461e8d..87af7f3b7 100644
--- a/r2/r2/templates/wikibasepage.html
+++ b/r2/r2/templates/wikibasepage.html
@@ -53,14 +53,16 @@
%endif
-
-
-%if thing.description:
-
- ${unsafe(thing.description)}
-%endif
-