Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

3 files changed, 8 insertions, 2 deletions

diff --git a/sneakyidea/README.rst b/sneakyidea/README.rst
index 75d691e..b53107b 100644
--- a/sneakyidea/README.rst
+++ b/sneakyidea/README.rst
@@ -8,3 +8,9 @@ To make the tag cloud accessible from the navigation bar add ::
     $ MENUITEMS = (('Tags', 'tags.html'),)
 
 in your settings.
+
+Screenshot
+----------
+
+.. image:: screenshot.png
+   :alt: Screenshot of the theme
diff --git a/sneakyidea/templates/article.html b/sneakyidea/templates/article.html
index 16cf8c1..6b20c6e 100644
--- a/sneakyidea/templates/article.html
+++ b/sneakyidea/templates/article.html
@@ -4,7 +4,7 @@
 <section id="content" class="body">    
 <article>
         <header> <h1 class="entry-title"><a href="{{ article.url }}"
-        rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title
+        rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title
         }}</a></h1> {% include 'twitter.html' %} {% include 
         'google_plusone.html' %} </header>
         <div class="entry-content">
diff --git a/sneakyidea/templates/index.html b/sneakyidea/templates/index.html
index 6b0ddba..9b7dfa9 100644
--- a/sneakyidea/templates/index.html
+++ b/sneakyidea/templates/index.html
@@ -21,7 +21,7 @@
     {% else %} 
         <li><article class="hentry">    
                 <header>
-                        <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h1>
+                        <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
                 </header>
                 
                 <div class="entry-content">