diff options
| author | friendica <info@friendica.com> | 2014-11-17 15:27:18 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-11-17 15:27:18 -0800 |
| commit | 064b48fa712acf00162a65638b134883c8b1afa0 (patch) | |
| tree | a09ed244d3c6f7a1a37400b0d4d5c845add17e04 /view/theme/redbasic/php/theme_init.php | |
| parent | 13a7637d9d17a2ea8adcdb635842ca12dfc0a632 (diff) | |
| parent | e59f7cc198fb038cd8344c2d403b423d57300a96 (diff) | |
| download | volse-hubzilla-064b48fa712acf00162a65638b134883c8b1afa0.tar.gz volse-hubzilla-064b48fa712acf00162a65638b134883c8b1afa0.tar.bz2 volse-hubzilla-064b48fa712acf00162a65638b134883c8b1afa0.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/theme/redbasic/php/theme_init.php')
| -rw-r--r-- | view/theme/redbasic/php/theme_init.php | 5 |
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'); |