aboutsummaryrefslogtreecommitdiffstats
path: root/view/php
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-12-22 14:47:37 +0100
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-12-22 14:47:37 +0100
commit031b9b7d775bbc2f88e8f2e6057b67286297042c (patch)
treea8c7391bfe799703aa0a8f26b9ee788f1204e8be /view/php
parent7e7b5bfa4930493a8feae10b0550e29797956c70 (diff)
parent870df76463a1cc9823b364db0bfb387f3f46664f (diff)
downloadvolse-hubzilla-031b9b7d775bbc2f88e8f2e6057b67286297042c.tar.gz
volse-hubzilla-031b9b7d775bbc2f88e8f2e6057b67286297042c.tar.bz2
volse-hubzilla-031b9b7d775bbc2f88e8f2e6057b67286297042c.zip
Merge branch 'bootstrap'
Diffstat (limited to 'view/php')
-rw-r--r--view/php/theme_init.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index e1625b3e5..509df8fef 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -10,10 +10,15 @@ head_add_css('library/jgrowl/jquery.jgrowl.css');
head_add_css('library/jslider/css/jslider.css');
head_add_css('library/prettyphoto/css/prettyPhoto.css');
head_add_css('library/colorbox/colorbox.css');
+
// head_add_css('library/font_awesome/css/font-awesome.min.css');
head_add_css('view/css/conversation.css');
head_add_css('view/css/bootstrap-red.css');
head_add_css('view/css/widgets.css');
+<<<<<<< HEAD
+head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
+=======
+>>>>>>> upstream/master
head_add_js('js/jquery.js');
head_add_js('library/bootstrap/js/bootstrap.min.js');
@@ -43,7 +48,8 @@ head_add_js('library/jslider/bin/jquery.slider.min.js');
head_add_js('docready.js');
head_add_js('library/prettyphoto/js/jquery.prettyPhoto.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.
* Those who don't, won't.