aboutsummaryrefslogtreecommitdiffstats
path: root/view/php/theme_init.php
diff options
context:
space:
mode:
authorTony Baldwin <tonybaldwin@gmx.com>2014-03-09 19:22:54 -0400
committerTony Baldwin <tonybaldwin@gmx.com>2014-03-09 19:22:54 -0400
commit5cca00ddc79dad667464674e08a2a860e262eabd (patch)
tree53df980e32a6706e977a5a2276e0f9aa9ec09300 /view/php/theme_init.php
parent67166180bb560276273a20bcd9ca2a7aae036aba (diff)
parenta79072ce478a999b06df38ae324fbcef6d3a76e7 (diff)
downloadvolse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.gz
volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.bz2
volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: view/theme/redbasic/tpl/theme_settings.tpl reset to upstream
Diffstat (limited to 'view/php/theme_init.php')
-rw-r--r--view/php/theme_init.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index b6aa5de0f..45eb2fc1d 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -2,8 +2,6 @@
require_once('include/plugin.php');
-head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
-head_add_css('library/bootstrap/css/bootstrap.min.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');
@@ -11,13 +9,10 @@ head_add_css('library/jslider/css/jslider.css');
head_add_css('library/colorbox/colorbox.css');
head_add_css('view/css/conversation.css');
-head_add_css('view/css/bootstrap-red.css');
head_add_css('view/css/widgets.css');
-head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
+
head_add_js('jquery.js');
-head_add_js('library/bootstrap/js/bootstrap.min.js');
-head_add_js('library/bootstrap/js/bootbox.min.js');
head_add_js('jquery-migrate-1.1.1.js');
//head_add_js('jquery-compat.js');
head_add_js('spin.js');
@@ -42,8 +37,6 @@ head_add_js('crypto.js');
head_add_js('library/jslider/bin/jquery.slider.min.js');
head_add_js('docready.js');
head_add_js('library/colorbox/jquery.colorbox-min.js');
-head_add_js('library/bootstrap-datetimepicker/js/moment.js');
-head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
/**
* Those who require this feature will know what to do with it.