Moved Bootstrap around, and added jQuery

2012-04-13 13:26:11 +01:00 · 2012-04-13 13:26:11 +01:00 · 24b134a9cf
commit 24b134a9cf
--- a/tiddlywiki5/lib/bootstrap/css/bootstrap.css
+++ b/tiddlywiki5/lib/bootstrap/css/bootstrap.css
--- a/tiddlywiki5/lib/bootstrap/css/bootstrap.min.css
+++ b/tiddlywiki5/lib/bootstrap/css/bootstrap.min.css
--- a/tiddlywiki5/lib/bootstrap/img/glyphicons-halflings-white.png
+++ b/tiddlywiki5/lib/bootstrap/img/glyphicons-halflings-white.png
--- a/tiddlywiki5/lib/bootstrap/img/glyphicons-halflings.png
+++ b/tiddlywiki5/lib/bootstrap/img/glyphicons-halflings.png
--- a/tiddlywiki5/lib/bootstrap/js/bootstrap.js
+++ b/tiddlywiki5/lib/bootstrap/js/bootstrap.js
--- a/tiddlywiki5/lib/bootstrap/js/bootstrap.min.js
+++ b/tiddlywiki5/lib/bootstrap/js/bootstrap.min.js
--- a/tiddlywiki5/lib/jquery.js
+++ b/tiddlywiki5/lib/jquery.js
--- a/tiddlywiki5/tiddlywiki5.recipe
+++ b/tiddlywiki5/tiddlywiki5.recipe
@ -1,5 +1,6 @@
 template: tiddlywiki5.template.html
 copyright: ../copyright.txt
+style: lib/bootstrap/css/bootstrap.css
 style: shadows/css/*.css

 shadow: shadows/*.tid
@ -7,7 +8,8 @@ shadow: shadows/templates/*.tid
 #tiddler: http://wikitext.tiddlyspace.com/fractalveg.jpg
 #	type: image/jpeg

-jslib: lib/zepto.js
+#jslib: lib/jquery.js
+#jslib: lib/bootstrap/js/bootstrap.js

 jsmodule: ../js/*.js