Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 13 insertions, 0 deletions

diff --git a/bootstrap2-dark/templates/page.html b/bootstrap2-dark/templates/page.html
new file mode 100644
index 0000000..223b52c
--- /dev/null
+++ b/bootstrap2-dark/templates/page.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% block title %}{{ page.title }}{% endblock %}
+{% block content %}
+<section id="content" class="body">
+        <h1 class="entry-title">{{ page.title }}</h1>
+        {% if PDF_PROCESSOR %}
+                <a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">
+                        get the pdf
+                </a>
+        {% endif %}
+        {{ page.content }}
+</section>
+{% endblock %}