Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

6 files changed, 32 insertions, 580 deletions

diff --git a/monospace/README.md b/monospace/README.md
index 992ce13..a643892 100644
--- a/monospace/README.md
+++ b/monospace/README.md
@@ -2,7 +2,17 @@
 monospace
 ==========
 Theme adapted from [monospace for wordpress](http://wordpress.org/themes/monospace)
-Here is a [screengrab](https://github.com/lwm/pelican-themes/blob/master/monospace/screenshot.png) for your viewing pleasure.
+Here is a screenshot for your viewing pleasure:
+
+![screengrab](screenshot.png)
+
+If you are using ``Markdown`` you need to include the following option in your ``pelicanconf.py`` for syntax highlighting.
+
+    MD_EXTENSIONS = ['codehilite(css_class=codehilite code)']
+
+Also, you might want to include the ``DESCRIPTION`` option (it appears in the left sidebar):
+
+    DESCRIPTION = 'My blog and stuff ...'
 
 Nice and simple, 
 Enjoy!
diff --git a/monospace/static/css/bckups/main.css b/monospace/static/css/bckups/main.css
deleted file mode 100644
index 94d0837..0000000
--- a/monospace/static/css/bckups/main.css
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-    Theme Name: mnmlist
-    Theme URI: http://mathieu.agopian.info/mnmlist/theme.html
-    Description: Theme adapted from http://mnmlist.com/theme/ from Leo Babauta, a very clean minimalist theme, without comments, search, archives or other features.
-    Author: Mathieu Agopian
-    Autor URI: http://mathieu.agopian.info
-
-    This theme is uncopyrighted, free, and offered as is.
-*/
-@import url("pygment.css");
-/* line 13, ../../compass/src/main.scss */
-body {
-  background: #fff;
-  color: #333;
-  font: 20px Hoefler Text, bodyfont, serif;
-  line-height: 30px;
-  max-width: 30em;
-  margin: 60px 14px 0 64px;
-}
-
-/* line 28, ../../compass/src/main.scss */
-h1 {
-  color: #333333;
-  font-family: Helvetica, sans-serif;
-  font-size: 1.5em;
-  font-weight: normal;
-  margin-bottom: 0;
-}
-
-/* line 34, ../../compass/src/main.scss */
-h2 {
-  color: #666666;
-  font-family: Helvetica, sans-serif;
-  font-size: 1.3em;
-}
-
-/* line 38, ../../compass/src/main.scss */
-h3 {
-  color: #666666;
-  font-family: Helvetica, sans-serif;
-  font-size: 1em;
-}
-
-/* line 42, ../../compass/src/main.scss */
-h4 {
-  color: #666666;
-  font-family: Helvetica, sans-serif;
-  font-size: 0.9em;
-}
-
-/* line 46, ../../compass/src/main.scss */
-time {
-  color: #c0c0c0;
-  font-size: 50%;
-}
-
-/* line 51, ../../compass/src/main.scss */
-img {
-  border: none;
-}
-
-/* line 55, ../../compass/src/main.scss */
-blockquote {
-  border-left: 1px solid #A5ABAB;
-  margin: 0px;
-  padding: 0 12px 0 12px;
-}
-
-/* line 61, ../../compass/src/main.scss */
-p {
-  line-height: 30px;
-  margin: 30px auto;
-  text-indent: 0px;
-}
-/* line 65, ../../compass/src/main.scss */
-p.caption {
-  font-size: 80%;
-  margin-top: 0;
-}
-
-/* line 71, ../../compass/src/main.scss */
-a {
-  border-bottom: #999 1px solid;
-  color: #303030;
-  text-decoration: none;
-}
-/* line 75, ../../compass/src/main.scss */
-a:hover {
-  color: #999;
-}
-
-/* line 78, ../../compass/src/main.scss */
-ul, ol {
-  padding: .5em 0em 1em 3.2em;
-}
-/* line 80, ../../compass/src/main.scss */
-ul li, ol li {
-  line-height: 30px;
-  padding: 6px 0 0 0;
-}
-
-/* line 86, ../../compass/src/main.scss */
-strong {
-  color: #555555;
-  font-family: Georgia, "Times New Roman", Times, serif;
-  font-weight: bold;
-}
-
-/* line 92, ../../compass/src/main.scss */
-tt, pre {
-  background-color: #fafafa;
-  font-family: Inconsolata, Monaco, monospace;
-  line-height: 1.2em;
-}
-
-/* line 98, ../../compass/src/main.scss */
-pre {
-  font-size: 0.8em;
-  overflow: auto;
-  padding: 10px;
-}
-
-/* line 104, ../../compass/src/main.scss */
-header {
-  padding-bottom: 20px;
-}
-/* line 106, ../../compass/src/main.scss */
-header a {
-  border-bottom: none;
-}
-/* line 108, ../../compass/src/main.scss */
-header a#page-title {
-  font-weight: bold;
-}
-
-/* line 112, ../../compass/src/main.scss */
-#article-list {
-  margin-top: 100px;
-}
-/* line 114, ../../compass/src/main.scss */
-#article-list ol li {
-  line-height: 1.2em;
-  list-style-type: none;
-  padding-bottom: 10px;
-}
-
-/* line 121, ../../compass/src/main.scss */
-footer {
-  background: #fff;
-  color: #666;
-  font-family: helvetica, sans-serif;
-  font-size: 13px;
-  letter-spacing: 4px;
-  margin-left: 20px;
-}
-/* line 128, ../../compass/src/main.scss */
-footer a {
-  border-bottom: none;
-  color: #c0c0c0;
-}
-/* line 132, ../../compass/src/main.scss */
-footer li {
-  display: inline;
-}
-/* line 135, ../../compass/src/main.scss */
-footer p {
-  text-align: right;
-}
diff --git a/monospace/static/css/bckups/pygment.css b/monospace/static/css/bckups/pygment.css
deleted file mode 100644
index 594b0fa..0000000
--- a/monospace/static/css/bckups/pygment.css
+++ /dev/null
@@ -1,205 +0,0 @@
-.hll {
-background-color:#FFFFCC;
-}
-.c {
-color:#408090;
-font-style:italic;
-}
-.err {
-border:1px solid #FF0000;
-}
-.k {
-color:#007020;
-font-weight:bold;
-}
-.o {
-color:#666666;
-}
-.cm {
-color:#408090;
-font-style:italic;
-}
-.cp {
-color:#007020;
-}
-.c1 {
-color:#408090;
-font-style:italic;
-}
-.cs {
-background-color:#FFF0F0;
-color:#408090;
-}
-.gd {
-color:#A00000;
-}
-.ge {
-font-style:italic;
-}
-.gr {
-color:#FF0000;
-}
-.gh {
-color:#000080;
-font-weight:bold;
-}
-.gi {
-color:#00A000;
-}
-.go {
-color:#303030;
-}
-.gp {
-color:#C65D09;
-font-weight:bold;
-}
-.gs {
-font-weight:bold;
-}
-.gu {
-color:#800080;
-font-weight:bold;
-}
-.gt {
-color:#0040D0;
-}
-.kc {
-color:#007020;
-font-weight:bold;
-}
-.kd {
-color:#007020;
-font-weight:bold;
-}
-.kn {
-color:#007020;
-font-weight:bold;
-}
-.kp {
-color:#007020;
-}
-.kr {
-color:#007020;
-font-weight:bold;
-}
-.kt {
-color:#902000;
-}
-.m {
-color:#208050;
-}
-.s {
-color:#4070A0;
-}
-.na {
-color:#4070A0;
-}
-.nb {
-color:#007020;
-}
-.nc {
-color:#0E84B5;
-font-weight:bold;
-}
-.no {
-color:#60ADD5;
-}
-.nd {
-color:#555555;
-font-weight:bold;
-}
-.ni {
-color:#D55537;
-font-weight:bold;
-}
-.ne {
-color:#007020;
-}
-.nf {
-color:#06287E;
-}
-.nl {
-color:#002070;
-font-weight:bold;
-}
-.nn {
-color:#0E84B5;
-font-weight:bold;
-}
-.nt {
-color:#062873;
-font-weight:bold;
-}
-.nv {
-color:#BB60D5;
-}
-.ow {
-color:#007020;
-font-weight:bold;
-}
-.w {
-color:#BBBBBB;
-}
-.mf {
-color:#208050;
-}
-.mh {
-color:#208050;
-}
-.mi {
-color:#208050;
-}
-.mo {
-color:#208050;
-}
-.sb {
-color:#4070A0;
-}
-.sc {
-color:#4070A0;
-}
-.sd {
-color:#4070A0;
-font-style:italic;
-}
-.s2 {
-color:#4070A0;
-}
-.se {
-color:#4070A0;
-font-weight:bold;
-}
-.sh {
-color:#4070A0;
-}
-.si {
-color:#70A0D0;
-font-style:italic;
-}
-.sx {
-color:#C65D09;
-}
-.sr {
-color:#235388;
-}
-.s1 {
-color:#4070A0;
-}
-.ss {
-color:#517918;
-}
-.bp {
-color:#007020;
-}
-.vc {
-color:#BB60D5;
-}
-.vg {
-color:#BB60D5;
-}
-.vi {
-color:#BB60D5;
-}
-.il {
-color:#208050;
-}
diff --git a/monospace/static/css/main.css b/monospace/static/css/main.css
index 0e17313..14f2e43 100644
--- a/monospace/static/css/main.css
+++ b/monospace/static/css/main.css
@@ -10,10 +10,11 @@
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
  */
 
+@import url("pygment.css");
+
 body { margin:0px; padding:20px 0px; text-align:center; font-family:Monospace; color:#585858; }
 a, a:visited { text-decoration:none; color:rgb(17, 170, 34); }
 a:hover { color:#FFF; background-color:#5353CB }
-pre { overflow-x:scroll; }
 h1, h2, h3, h4, h5, h6, h7 { margin:0px; text-transform:uppercase; }
 h4, h5, h6 { font-size:14px; }
 h1 { padding:0px 0px 15px; margin:0px 0px 15px 0px; }
diff --git a/monospace/static/css/pygment.css b/monospace/static/css/pygment.css
index 594b0fa..f4581c2 100644
--- a/monospace/static/css/pygment.css
+++ b/monospace/static/css/pygment.css
@@ -1,205 +1,2 @@
-.hll {
-background-color:#FFFFCC;
-}
-.c {
-color:#408090;
-font-style:italic;
-}
-.err {
-border:1px solid #FF0000;
-}
-.k {
-color:#007020;
-font-weight:bold;
-}
-.o {
-color:#666666;
-}
-.cm {
-color:#408090;
-font-style:italic;
-}
-.cp {
-color:#007020;
-}
-.c1 {
-color:#408090;
-font-style:italic;
-}
-.cs {
-background-color:#FFF0F0;
-color:#408090;
-}
-.gd {
-color:#A00000;
-}
-.ge {
-font-style:italic;
-}
-.gr {
-color:#FF0000;
-}
-.gh {
-color:#000080;
-font-weight:bold;
-}
-.gi {
-color:#00A000;
-}
-.go {
-color:#303030;
-}
-.gp {
-color:#C65D09;
-font-weight:bold;
-}
-.gs {
-font-weight:bold;
-}
-.gu {
-color:#800080;
-font-weight:bold;
-}
-.gt {
-color:#0040D0;
-}
-.kc {
-color:#007020;
-font-weight:bold;
-}
-.kd {
-color:#007020;
-font-weight:bold;
-}
-.kn {
-color:#007020;
-font-weight:bold;
-}
-.kp {
-color:#007020;
-}
-.kr {
-color:#007020;
-font-weight:bold;
-}
-.kt {
-color:#902000;
-}
-.m {
-color:#208050;
-}
-.s {
-color:#4070A0;
-}
-.na {
-color:#4070A0;
-}
-.nb {
-color:#007020;
-}
-.nc {
-color:#0E84B5;
-font-weight:bold;
-}
-.no {
-color:#60ADD5;
-}
-.nd {
-color:#555555;
-font-weight:bold;
-}
-.ni {
-color:#D55537;
-font-weight:bold;
-}
-.ne {
-color:#007020;
-}
-.nf {
-color:#06287E;
-}
-.nl {
-color:#002070;
-font-weight:bold;
-}
-.nn {
-color:#0E84B5;
-font-weight:bold;
-}
-.nt {
-color:#062873;
-font-weight:bold;
-}
-.nv {
-color:#BB60D5;
-}
-.ow {
-color:#007020;
-font-weight:bold;
-}
-.w {
-color:#BBBBBB;
-}
-.mf {
-color:#208050;
-}
-.mh {
-color:#208050;
-}
-.mi {
-color:#208050;
-}
-.mo {
-color:#208050;
-}
-.sb {
-color:#4070A0;
-}
-.sc {
-color:#4070A0;
-}
-.sd {
-color:#4070A0;
-font-style:italic;
-}
-.s2 {
-color:#4070A0;
-}
-.se {
-color:#4070A0;
-font-weight:bold;
-}
-.sh {
-color:#4070A0;
-}
-.si {
-color:#70A0D0;
-font-style:italic;
-}
-.sx {
-color:#C65D09;
-}
-.sr {
-color:#235388;
-}
-.s1 {
-color:#4070A0;
-}
-.ss {
-color:#517918;
-}
-.bp {
-color:#007020;
-}
-.vc {
-color:#BB60D5;
-}
-.vg {
-color:#BB60D5;
-}
-.vi {
-color:#BB60D5;
-}
-.il {
-color:#208050;
-}
+.highlight code,.highlight pre{color:#fdce93;background-color:#3f3f3f;padding:10px;}.highlight .hll{background-color:#222}.highlight .c{color:#7f9f7f}.highlight .err{color:#e37170;background-color:#3d3535}.highlight .g{color:#7f9f7f}.highlight .k{color:#f0dfaf}.highlight .l{color:#ccc}.highlight .n{color:#dcdccc}.highlight .o{color:#f0efd0}.highlight .x{color:#ccc}.highlight .p{color:#41706f}.highlight .cm{color:#7f9f7f}.highlight .cp{color:#7f9f7f}.highlight .c1{color:#7f9f7f}.highlight .cs{color:#cd0000;font-weight:bold}.highlight .gd{color:#cd0000}.highlight .ge{color:#ccc;font-style:italic}.highlight .gr{color:red}.highlight .gh{color:#dcdccc;font-weight:bold}.highlight .gi{color:#00cd00}.highlight .go{color:gray}.highlight .gp{color:#dcdccc;font-weight:bold}.highlight .gs{color:#ccc;font-weight:bold}.highlight .gu{color:purple;font-weight:bold}.highlight .gt{color:#0040D0}.highlight .kc{color:#dca3a3}.highlight .kd{color:#ffff86}.highlight .kn{color:#dfaf8f;font-weight:bold}.highlight .kp{color:#cdcf99}.highlight .kr{color:#cdcd00}.highlight .kt{color:#00cd00}.highlight .ld{color:#cc9393}.highlight .m{color:#8cd0d3}.highlight .s{color:#cc9393}.highlight .na{color:#9ac39f}.highlight .nb{color:#efef8f}.highlight .nc{color:#efef8f}.highlight .no{color:#ccc}.highlight .nd{color:#ccc}.highlight .ni{color:#c28182}.highlight .ne{color:#c3bf9f;font-weight:bold}.highlight .nf{color:#efef8f}.highlight .nl{color:#ccc}.highlight .nn{color:#8fbede}.highlight .nx{color:#ccc}.highlight .py{color:#ccc}.highlight .nt{color:#9ac39f}.highlight .nv{color:#dcdccc}.highlight .ow{color:#f0efd0}.highlight .w{color:#ccc}.highlight .mf{color:#8cd0d3}.highlight .mh{color:#8cd0d3}.highlight .mi{color:#8cd0d3}.highlight .mo{color:#8cd0d3}.highlight .sb{color:#cc9393}.highlight .sc{color:#cc9393}.highlight .sd{color:#cc9393}.highlight .s2{color:#cc9393}.highlight .se{color:#cc9393}.highlight .sh{color:#cc9393}.highlight .si{color:#cc9393}.highlight .sx{color:#cc9393}.highlight .sr{color:#cc9393}.highlight .s1{color:#cc9393}.highlight .ss{color:#cc9393}.highlight .bp{color:#efef8f}.highlight .vc{color:#efef8f}.highlight .vg{color:#dcdccc}.highlight .vi{color:#ffffc7}.highlight .il{color:#8cd0d3}
+
diff --git a/monospace/templates/article.html b/monospace/templates/article.html
index 9758fdc..722e5c5 100644
--- a/monospace/templates/article.html
+++ b/monospace/templates/article.html
@@ -8,5 +8,22 @@
 </header>
 <article>
     {{ article.content }}
+    {% if DISQUS_SITENAME and SITEURL and article.status != "draft" %}
+    <h2>Comments</h2>
+    <div id="disqus_thread"></div>
+    <script type="text/javascript">
+       var disqus_shortname = '{{ DISQUS_SITENAME }}';
+       var disqus_identifier = '{{ article.url }}';
+       var disqus_url = '{{ SITEURL }}/{{ article.url }}';
+       (function() {
+            var dsq = document.createElement('script');
+            dsq.type = 'text/javascript'; dsq.async = true;
+            dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+            (document.getElementsByTagName('head')[0] ||
+             document.getElementsByTagName('body')[0]).appendChild(dsq);
+      })();
+    </script>
+    <noscript>Please enable JavaScript to view the comments.</noscript>
+    {% endif %}
 </article>
 {% endblock %}