aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-17 15:45:41 -0700
committerfriendica <info@friendica.com>2015-03-17 15:45:41 -0700
commitf5602f129eb24ccd1690f49cc272bf2c352e5238 (patch)
tree04b8206abd58f44cf53f5a2207ec620ce1ea06b4 /view
parent629f6bec74bcc5f1bd6ea40bf020a8107bc54fb0 (diff)
parent9472d0a6839e4ce820edcf431e8c809b66741987 (diff)
downloadvolse-hubzilla-f5602f129eb24ccd1690f49cc272bf2c352e5238.tar.gz
volse-hubzilla-f5602f129eb24ccd1690f49cc272bf2c352e5238.tar.bz2
volse-hubzilla-f5602f129eb24ccd1690f49cc272bf2c352e5238.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/php/theme_init.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index dd4542e8a..498d1ee15 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -1,7 +1,6 @@
<?php
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/datetimepicker/jquery.datetimepicker.css');
@@ -10,7 +9,7 @@ head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.c
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/bootbox/bootbox.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');