Merge branch 'bootstrap'

This commit is contained in:
Christian Vogeley
2013-12-08 16:45:23 +01:00
12 changed files with 9842 additions and 0 deletions

View File

@@ -2,6 +2,8 @@
require_once('include/plugin.php');
head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
head_add_css('library/bootstrap/css/bootstrap.css');
head_add_css('library/fancybox/jquery.fancybox-1.3.4.css');
head_add_css('library/tiptip/tipTip.css');
head_add_css('library/jgrowl/jquery.jgrowl.css');
@@ -12,6 +14,8 @@ head_add_css('library/colorbox/colorbox.css');
head_add_css('view/css/conversation.css');
head_add_js('js/jquery.js');
head_add_js('library/bootstrap/js/bootstrap.min.js');
head_add_js('library/bootstrap/js/bootbox.min.js');
head_add_js('js/jquery-migrate-1.1.1.js');
//head_add_js('js/jquery-compat.js');
head_add_js('js/spin.js');