aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2014-11-17 15:15:02 -0800
committerHabeas Codice <habeascodice@federated.social>2014-11-17 15:15:02 -0800
commit96427a23a3523daf2c1966fe1b8a6e119e797e50 (patch)
treea7aaea69271817bbc8f78396f0d98052ca52d3f3 /view/theme
parentbcaa32a83a965f111bfc2ba085a59857a4fa0c2d (diff)
parente59f7cc198fb038cd8344c2d403b423d57300a96 (diff)
downloadvolse-hubzilla-96427a23a3523daf2c1966fe1b8a6e119e797e50.tar.gz
volse-hubzilla-96427a23a3523daf2c1966fe1b8a6e119e797e50.tar.bz2
volse-hubzilla-96427a23a3523daf2c1966fe1b8a6e119e797e50.zip
Merge branch 'master' of https://github.com/habeascodice/red
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/php/theme_init.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 2fbca2ef0..dd4542e8a 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -4,15 +4,14 @@ head_add_css('library/font_awesome/css/font-awesome.min.css');
head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
head_add_css('library/bootstrap/css/bootstrap.min.css');
head_add_css('view/css/bootstrap-red.css');
-head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
+head_add_css('library/datetimepicker/jquery.datetimepicker.css');
//head_add_css('library/colorpicker/css/colorpicker.css');
head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
require_once('view/php/theme_init.php');
head_add_js('library/bootstrap/js/bootstrap.min.js');
head_add_js('library/bootstrap/js/bootbox.min.js');
-head_add_js('library/bootstrap-datetimepicker/js/moment.min.js');
-head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
+head_add_js('library/datetimepicker/jquery.datetimepicker.js');
//head_add_js('library/colorpicker/js/colorpicker.js');
head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
//head_add_js('library/bootstrap-colorpicker/src/js/docs.js');