Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 62 insertions, 0 deletions

diff --git a/pelican-bootstrap3/static/css/pygments/friendly.css b/pelican-bootstrap3/static/css/pygments/friendly.css
new file mode 100644
index 0000000..3f52d3d
--- /dev/null
+++ b/pelican-bootstrap3/static/css/pygments/friendly.css
@@ -0,0 +1,62 @@
+.highlight pre .hll { background-color: #ffffcc }
+.highlight pre, .highlighttable pre { background: #f0f0f0; }
+.highlight pre .c { color: #60a0b0; font-style: italic } /* Comment */
+.highlight pre .err { border: 1px solid #FF0000 } /* Error */
+.highlight pre .k { color: #007020; font-weight: bold } /* Keyword */
+.highlight pre .o { color: #666666 } /* Operator */
+.highlight pre .cm { color: #60a0b0; font-style: italic } /* Comment.Multiline */
+.highlight pre .cp { color: #007020 } /* Comment.Preproc */
+.highlight pre .c1 { color: #60a0b0; font-style: italic } /* Comment.Single */
+.highlight pre .cs { color: #60a0b0; background-color: #fff0f0 } /* Comment.Special */
+.highlight pre .gd { color: #A00000 } /* Generic.Deleted */
+.highlight pre .ge { font-style: italic } /* Generic.Emph */
+.highlight pre .gr { color: #FF0000 } /* Generic.Error */
+.highlight pre .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight pre .gi { color: #00A000 } /* Generic.Inserted */
+.highlight pre .go { color: #888888 } /* Generic.Output */
+.highlight pre .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
+.highlight pre .gs { font-weight: bold } /* Generic.Strong */
+.highlight pre .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight pre .gt { color: #0044DD } /* Generic.Traceback */
+.highlight pre .kc { color: #007020; font-weight: bold } /* Keyword.Constant */
+.highlight pre .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */
+.highlight pre .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */
+.highlight pre .kp { color: #007020 } /* Keyword.Pseudo */
+.highlight pre .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */
+.highlight pre .kt { color: #902000 } /* Keyword.Type */
+.highlight pre .m { color: #40a070 } /* Literal.Number */
+.highlight pre .s { color: #4070a0 } /* Literal.String */
+.highlight pre .na { color: #4070a0 } /* Name.Attribute */
+.highlight pre .nb { color: #007020 } /* Name.Builtin */
+.highlight pre .nc { color: #0e84b5; font-weight: bold } /* Name.Class */
+.highlight pre .no { color: #60add5 } /* Name.Constant */
+.highlight pre .nd { color: #555555; font-weight: bold } /* Name.Decorator */
+.highlight pre .ni { color: #d55537; font-weight: bold } /* Name.Entity */
+.highlight pre .ne { color: #007020 } /* Name.Exception */
+.highlight pre .nf { color: #06287e } /* Name.Function */
+.highlight pre .nl { color: #002070; font-weight: bold } /* Name.Label */
+.highlight pre .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
+.highlight pre .nt { color: #062873; font-weight: bold } /* Name.Tag */
+.highlight pre .nv { color: #bb60d5 } /* Name.Variable */
+.highlight pre .ow { color: #007020; font-weight: bold } /* Operator.Word */
+.highlight pre .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight pre .mf { color: #40a070 } /* Literal.Number.Float */
+.highlight pre .mh { color: #40a070 } /* Literal.Number.Hex */
+.highlight pre .mi { color: #40a070 } /* Literal.Number.Integer */
+.highlight pre .mo { color: #40a070 } /* Literal.Number.Oct */
+.highlight pre .sb { color: #4070a0 } /* Literal.String.Backtick */
+.highlight pre .sc { color: #4070a0 } /* Literal.String.Char */
+.highlight pre .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */
+.highlight pre .s2 { color: #4070a0 } /* Literal.String.Double */
+.highlight pre .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */
+.highlight pre .sh { color: #4070a0 } /* Literal.String.Heredoc */
+.highlight pre .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */
+.highlight pre .sx { color: #c65d09 } /* Literal.String.Other */
+.highlight pre .sr { color: #235388 } /* Literal.String.Regex */
+.highlight pre .s1 { color: #4070a0 } /* Literal.String.Single */
+.highlight pre .ss { color: #517918 } /* Literal.String.Symbol */
+.highlight pre .bp { color: #007020 } /* Name.Builtin.Pseudo */
+.highlight pre .vc { color: #bb60d5 } /* Name.Variable.Class */
+.highlight pre .vg { color: #bb60d5 } /* Name.Variable.Global */
+.highlight pre .vi { color: #bb60d5 } /* Name.Variable.Instance */
+.highlight pre .il { color: #40a070 } /* Literal.Number.Integer.Long */