aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic/php/theme_init.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-24 09:01:55 +1100
committerfriendica <info@friendica.com>2014-03-24 09:01:55 +1100
commitfb5f9fd9be94874dc2825bff9f9c1bc8d53baff4 (patch)
tree43eee6282fc2990e67bcc7c3db6069807d069ff1 /view/theme/redbasic/php/theme_init.php
parent6a014abe1c8f0475645ae8f514b473554847891b (diff)
parentc972a94b0125bcb82ef3fe8e97adef45f94404f2 (diff)
downloadvolse-hubzilla-fb5f9fd9be94874dc2825bff9f9c1bc8d53baff4.tar.gz
volse-hubzilla-fb5f9fd9be94874dc2825bff9f9c1bc8d53baff4.tar.bz2
volse-hubzilla-fb5f9fd9be94874dc2825bff9f9c1bc8d53baff4.zip
Merge pull request #376 from cvogeley/master
Add color picker to theme settings
Diffstat (limited to 'view/theme/redbasic/php/theme_init.php')
-rw-r--r--view/theme/redbasic/php/theme_init.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 12f49efa7..552399329 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -5,10 +5,15 @@ 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/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.js');
head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.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');
+