Merge pull request #1865 from getnikola/murder-bootstrap2

Delete Bootstrap 2 theme
getnikola · Jul 5, 2015 · 9ec5d99 · 9ec5d99
2 parents b4d237f + b4b6c2a
commit 9ec5d99
Show file tree

Hide file tree

Showing 145 changed files with 66 additions and 20,897 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,7 @@ New in master
 Features
 --------
 
+* 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)
 

diff --git a/nikola/data/symlinked.txt b/nikola/data/symlinked.txt
@@ -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
@@ -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
diff --git a/nikola/data/themes/bootstrap-jinja/AUTHORS.txt b/nikola/data/themes/bootstrap-jinja/AUTHORS.txt
diff --git a/nikola/data/themes/bootstrap-jinja/README.md b/nikola/data/themes/bootstrap-jinja/README.md