Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 40 insertions, 0 deletions

diff --git a/bootstrap2-dark/templates/article.html b/bootstrap2-dark/templates/article.html
new file mode 100644
index 0000000..638655c
--- /dev/null
+++ b/bootstrap2-dark/templates/article.html
@@ -0,0 +1,40 @@
+{% extends "base.html" %}
+{% block title %}{{ article.title }}{% endblock %}
+{% block content %}
+<section id="content">
+        <article>
+                <header>
+                        <h1>
+                                <a href="{{ pagename }}"
+                                        rel="bookmark"
+                                        title="Permalink to {{ article.title }}">
+                                        {{ article.title}}
+                                </a>
+                                {% include 'twitter.html' %}
+                        </h1>
+                </header>
+                <div class="entry-content">
+                <div class="well">
+                        {% include 'article_infos.html' %}
+                </div>
+                {{ article.content }}
+                </div><!-- /.entry-content -->
+                {% if DISQUS_SITENAME %}
+                <div class="comments">
+                <h2>Comments !</h2>
+                        <div id="disqus_thread"></div>
+                        <script type="text/javascript">
+                           var disqus_identifier = "{{ article.url }}";
+                           (function() {
+                                var dsq = document.createElement('script');
+                                dsq.type = 'text/javascript'; dsq.async = true;
+                                dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+                                (document.getElementsByTagName('head')[0] ||
+                                 document.getElementsByTagName('body')[0]).appendChild(dsq);
+                          })();
+                        </script>
+                </div>
+                {% endif %}
+        </article>
+</section>
+{% endblock %}