Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 28 insertions, 0 deletions

diff --git a/new-bootstrap2/README.rst b/new-bootstrap2/README.rst
new file mode 100644
index 0000000..21c189b
--- /dev/null
+++ b/new-bootstrap2/README.rst
@@ -0,0 +1,28 @@
+New Bootstrap 2 theme
+=====================
+
+This is slitly updated "Bootstrap 2" theme.
+
+You can find live example of it on `my site <http://infinitylx.org>`_.
+
+This is (yet another) theme for Pelican inspired by `Twitter Bootstrap 2.0 <http://twitter.github.com/bootstrap/>`_.
+
+It makes use of `Font-Awesome <http://fortawesome.github.com/Font-Awesome/>`_ icons, supports tag_cloud, translation,
+and try to keep other features from Pelican's default theme ``notmyidea``.
+
+Also you can see its result from `my Github Page <http://farseerfc.github.com/>`_. It will be updated using latest theme.
+
+Feel free to use it.
+
+New features
+============
+
+* Yandex.metrica - analytica from yandex. Use **"YANDEX_METRYKA"**
+
+* Shortmail - shortmail widget. Use **"SHORT_MAIL"**
+
+* Footer note template - you can set your footer note from config with **"FOOTER_NOTE"** variable or just simple edit **"footer.html"** file.
+
+* Add Twitter share button to post title.
+
+* etc.