Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into logging
  • Loading branch information
Kwpolska committed Jul 5, 2015
2 parents 806580d + 9ec5d99 commit 0c2c790
Show file tree
Hide file tree
Showing 145 changed files with 66 additions and 20,897 deletions.
1 change: 1 addition & 0 deletions CHANGES.txt
Expand Up @@ -5,6 +5,7 @@ Features
--------

* Remove logging handlers (Issue #1797)
* Delete old ``bootstrap`` theme (use ``bootstrap3`` instead)
* Screen reader-friendly navbar collapses and dropdowns (Issue #1863)
* Modern reST stylesheets, based in part on Bootstrap 3 (Issue #1150)

Expand Down
139 changes: 46 additions & 93 deletions nikola/data/symlinked.txt
Expand Up @@ -14,99 +14,6 @@ nikola/data/samplesite/stories/theming.rst
nikola/data/symlink-test-link.txt
nikola/data/themes/base/assets/js/moment-with-locales.min.js
nikola/data/themes/base/messages/messages_cz.py
nikola/data/themes/bootstrap-jinja/assets/css/colorbox.css
nikola/data/themes/bootstrap-jinja/assets/css/images/controls.png
nikola/data/themes/bootstrap-jinja/assets/css/images/loading.gif
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bn.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ca.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-cs.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-da.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-de.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-es.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-et.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fa.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fi.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fr.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gl.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gr.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-he.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hr.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hu.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-id.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-it.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ja.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-kr.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lt.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lv.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-my.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-nl.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-no.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pl.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ro.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ru.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-si.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sk.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sr.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sv.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-tr.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox-min.js
nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox.js
nikola/data/themes/bootstrap-jinja/assets/js/jquery.js
nikola/data/themes/bootstrap-jinja/assets/js/jquery.min.js
nikola/data/themes/bootstrap-jinja/assets/js/jquery.min.map
nikola/data/themes/bootstrap-jinja/bundles
nikola/data/themes/bootstrap/assets/css/colorbox.css
nikola/data/themes/bootstrap/assets/css/images/controls.png
nikola/data/themes/bootstrap/assets/css/images/loading.gif
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ar.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bg.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bn.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ca.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-cs.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-da.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-de.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-es.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-et.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fa.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fi.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fr.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gl.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gr.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-he.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hr.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hu.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-id.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-it.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ja.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-kr.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lt.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lv.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-my.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-nl.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-no.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pl.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ro.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ru.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-si.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sk.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sr.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sv.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-tr.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-uk.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
nikola/data/themes/bootstrap/assets/js/jquery.colorbox-min.js
nikola/data/themes/bootstrap/assets/js/jquery.colorbox.js
nikola/data/themes/bootstrap/assets/js/jquery.js
nikola/data/themes/bootstrap/assets/js/jquery.min.js
nikola/data/themes/bootstrap/assets/js/jquery.min.map
nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.css
nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.css.map
nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.min.css
Expand All @@ -127,11 +34,57 @@ nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.min.css
nikola/data/themes/bootstrap3/assets/css/bootstrap.css
nikola/data/themes/bootstrap3/assets/css/bootstrap.css.map
nikola/data/themes/bootstrap3/assets/css/bootstrap.min.css
nikola/data/themes/bootstrap3/assets/css/colorbox.css
nikola/data/themes/bootstrap3/assets/css/images/controls.png
nikola/data/themes/bootstrap3/assets/css/images/loading.gif
nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.eot
nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.svg
nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.ttf
nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.woff
nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.woff2
nikola/data/themes/bootstrap3/assets/js/bootstrap.js
nikola/data/themes/bootstrap3/assets/js/bootstrap.min.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ar.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-bg.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-bn.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ca.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-cs.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-da.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-de.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-es.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-et.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fa.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fi.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fr.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-gl.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-gr.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-he.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-hr.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-hu.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-id.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-it.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ja.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-kr.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-lt.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-lv.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-my.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-nl.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-no.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-pl.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ro.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ru.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-si.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sk.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sr.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sv.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-tr.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-uk.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
nikola/data/themes/bootstrap3/assets/js/jquery.colorbox-min.js
nikola/data/themes/bootstrap3/assets/js/jquery.colorbox.js
nikola/data/themes/bootstrap3/assets/js/jquery.js
nikola/data/themes/bootstrap3/assets/js/jquery.min.js
nikola/data/themes/bootstrap3/assets/js/jquery.min.map
nikola/plugins/command/auto/livereload.js
1 change: 0 additions & 1 deletion nikola/data/themes/bootstrap-jinja/AUTHORS.txt

This file was deleted.

23 changes: 0 additions & 23 deletions nikola/data/themes/bootstrap-jinja/README.md

This file was deleted.

0 comments on commit 0c2c790

Please sign in to comment.