Skip to content

Commit 0c2c790

Browse files
KwpolskaKwpolska
committedJul 5, 2015
Merge branch 'master' into logging
·
v8.3.1v7.1.1
2 parents 806580d + 9ec5d99 commit 0c2c790

File tree

145 files changed

+66
-20897
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+66
-20897
lines changed
 

‎CHANGES.txt

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Features
55
--------
66

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

‎nikola/data/symlinked.txt

+46-93
Original file line numberDiff line numberDiff line change
@@ -14,99 +14,6 @@ nikola/data/samplesite/stories/theming.rst
1414
nikola/data/symlink-test-link.txt
1515
nikola/data/themes/base/assets/js/moment-with-locales.min.js
1616
nikola/data/themes/base/messages/messages_cz.py
17-
nikola/data/themes/bootstrap-jinja/assets/css/colorbox.css
18-
nikola/data/themes/bootstrap-jinja/assets/css/images/controls.png
19-
nikola/data/themes/bootstrap-jinja/assets/css/images/loading.gif
20-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js
21-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js
22-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bn.js
23-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ca.js
24-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-cs.js
25-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-da.js
26-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-de.js
27-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-es.js
28-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-et.js
29-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fa.js
30-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fi.js
31-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fr.js
32-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gl.js
33-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gr.js
34-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-he.js
35-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hr.js
36-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hu.js
37-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-id.js
38-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-it.js
39-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ja.js
40-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-kr.js
41-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lt.js
42-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lv.js
43-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-my.js
44-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-nl.js
45-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-no.js
46-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pl.js
47-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
48-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ro.js
49-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ru.js
50-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-si.js
51-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sk.js
52-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sr.js
53-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sv.js
54-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-tr.js
55-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.js
56-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
57-
nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
58-
nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox-min.js
59-
nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox.js
60-
nikola/data/themes/bootstrap-jinja/assets/js/jquery.js
61-
nikola/data/themes/bootstrap-jinja/assets/js/jquery.min.js
62-
nikola/data/themes/bootstrap-jinja/assets/js/jquery.min.map
63-
nikola/data/themes/bootstrap-jinja/bundles
64-
nikola/data/themes/bootstrap/assets/css/colorbox.css
65-
nikola/data/themes/bootstrap/assets/css/images/controls.png
66-
nikola/data/themes/bootstrap/assets/css/images/loading.gif
67-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ar.js
68-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bg.js
69-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bn.js
70-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ca.js
71-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-cs.js
72-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-da.js
73-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-de.js
74-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-es.js
75-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-et.js
76-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fa.js
77-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fi.js
78-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fr.js
79-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gl.js
80-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gr.js
81-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-he.js
82-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hr.js
83-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hu.js
84-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-id.js
85-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-it.js
86-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ja.js
87-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-kr.js
88-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lt.js
89-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lv.js
90-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-my.js
91-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-nl.js
92-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-no.js
93-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pl.js
94-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
95-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ro.js
96-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ru.js
97-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-si.js
98-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sk.js
99-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sr.js
100-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sv.js
101-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-tr.js
102-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-uk.js
103-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
104-
nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
105-
nikola/data/themes/bootstrap/assets/js/jquery.colorbox-min.js
106-
nikola/data/themes/bootstrap/assets/js/jquery.colorbox.js
107-
nikola/data/themes/bootstrap/assets/js/jquery.js
108-
nikola/data/themes/bootstrap/assets/js/jquery.min.js
109-
nikola/data/themes/bootstrap/assets/js/jquery.min.map
11017
nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.css
11118
nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.css.map
11219
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
12734
nikola/data/themes/bootstrap3/assets/css/bootstrap.css
12835
nikola/data/themes/bootstrap3/assets/css/bootstrap.css.map
12936
nikola/data/themes/bootstrap3/assets/css/bootstrap.min.css
37+
nikola/data/themes/bootstrap3/assets/css/colorbox.css
38+
nikola/data/themes/bootstrap3/assets/css/images/controls.png
39+
nikola/data/themes/bootstrap3/assets/css/images/loading.gif
13040
nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.eot
13141
nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.svg
13242
nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.ttf
13343
nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.woff
13444
nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.woff2
13545
nikola/data/themes/bootstrap3/assets/js/bootstrap.js
13646
nikola/data/themes/bootstrap3/assets/js/bootstrap.min.js
47+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ar.js
48+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-bg.js
49+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-bn.js
50+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ca.js
51+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-cs.js
52+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-da.js
53+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-de.js
54+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-es.js
55+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-et.js
56+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fa.js
57+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fi.js
58+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fr.js
59+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-gl.js
60+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-gr.js
61+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-he.js
62+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-hr.js
63+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-hu.js
64+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-id.js
65+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-it.js
66+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ja.js
67+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-kr.js
68+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-lt.js
69+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-lv.js
70+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-my.js
71+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-nl.js
72+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-no.js
73+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-pl.js
74+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
75+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ro.js
76+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ru.js
77+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-si.js
78+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sk.js
79+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sr.js
80+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sv.js
81+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-tr.js
82+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-uk.js
83+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
84+
nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
85+
nikola/data/themes/bootstrap3/assets/js/jquery.colorbox-min.js
86+
nikola/data/themes/bootstrap3/assets/js/jquery.colorbox.js
87+
nikola/data/themes/bootstrap3/assets/js/jquery.js
88+
nikola/data/themes/bootstrap3/assets/js/jquery.min.js
89+
nikola/data/themes/bootstrap3/assets/js/jquery.min.map
13790
nikola/plugins/command/auto/livereload.js

0 commit comments

Comments
 (0)
Please sign in to comment.