Merge branch 'master' into baguette-captions

getnikola · Jun 8, 2017 · 1d1a330 · 1d1a330
2 parents 91a4529 + a64dcac
commit 1d1a330
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/nikola/data/symlinked.txt b/nikola/data/symlinked.txt
@@ -15,18 +15,14 @@ nikola/data/samplesite/pages/path_handlers.txt
 nikola/data/samplesite/pages/social_buttons.txt
 nikola/data/samplesite/pages/theming.rst
 nikola/data/symlink-test-link.txt
-nikola/data/themes/base/assets/css/baguetteBox.css
 nikola/data/themes/base/assets/css/baguetteBox.min.css
-nikola/data/themes/base/assets/js/baguetteBox.js
 nikola/data/themes/base/assets/js/baguetteBox.min.js
+nikola/data/themes/base/assets/js/html5.js
+nikola/data/themes/base/assets/js/html5shiv-printshiv.min.js
 nikola/data/themes/base/assets/js/moment-with-locales.min.js
 nikola/data/themes/base/messages/messages_cz.py
-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
 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.min.css.map
-nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.css
-nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.css.map
 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.min.css
 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.min.css.map
 nikola/data/themes/bootstrap3-jinja/assets/css/colorbox.css
@@ -37,7 +33,6 @@ nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.sv
 nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.ttf
 nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.woff
 nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.woff2
-nikola/data/themes/bootstrap3-jinja/assets/js/bootstrap.js
 nikola/data/themes/bootstrap3-jinja/assets/js/bootstrap.min.js
 nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js
 nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js
@@ -78,17 +73,11 @@ nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.j
 nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
 nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
 nikola/data/themes/bootstrap3-jinja/assets/js/jquery.colorbox-min.js
-nikola/data/themes/bootstrap3-jinja/assets/js/jquery.colorbox.js
-nikola/data/themes/bootstrap3-jinja/assets/js/jquery.js
 nikola/data/themes/bootstrap3-jinja/assets/js/jquery.min.js
 nikola/data/themes/bootstrap3-jinja/assets/js/jquery.min.map
 nikola/data/themes/bootstrap3-jinja/bundles
-nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.css
-nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.css.map
 nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.min.css
 nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.min.css.map
-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/bootstrap.min.css.map
 nikola/data/themes/bootstrap3/assets/css/colorbox.css
@@ -99,7 +88,6 @@ 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
@@ -140,8 +128,6 @@ 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/bootstrap3-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
@@ -46,7 +46,6 @@ lang="{{ lang }}">
     <meta name="generator" content="Nikola (getnikola.com)">
     {% endif %}
     {{ feed.head() }}
-    {{ html_feedlinks() }}
     <link rel="canonical" href="{{ abs_link(permalink) }}">
 
     {% if favicons %}

diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
@@ -46,7 +46,6 @@ lang="${lang}">
     <meta name="generator" content="Nikola (getnikola.com)">
     % endif
     ${feed.head()}
-    ${html_feedlinks()}
     <link rel="canonical" href="${abs_link(permalink)}">
 
     %if favicons: