From 9a2e73ae1522c7e69d7d6e0ca6c1089189c6e697 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 25 Feb 2014 16:29:00 -0800 Subject: move bootstrap to theme and out of core. --- view/php/theme_init.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'view/php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index b6aa5de0f..45eb2fc1d 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -2,8 +2,6 @@ require_once('include/plugin.php'); -head_add_css('library/bootstrap/css/bootstrap-theme.min.css'); -head_add_css('library/bootstrap/css/bootstrap.min.css'); head_add_css('library/fancybox/jquery.fancybox-1.3.4.css'); head_add_css('library/tiptip/tipTip.css'); head_add_css('library/jgrowl/jquery.jgrowl.css'); @@ -11,13 +9,10 @@ head_add_css('library/jslider/css/jslider.css'); head_add_css('library/colorbox/colorbox.css'); head_add_css('view/css/conversation.css'); -head_add_css('view/css/bootstrap-red.css'); head_add_css('view/css/widgets.css'); -head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'); + head_add_js('jquery.js'); -head_add_js('library/bootstrap/js/bootstrap.min.js'); -head_add_js('library/bootstrap/js/bootbox.min.js'); head_add_js('jquery-migrate-1.1.1.js'); //head_add_js('jquery-compat.js'); head_add_js('spin.js'); @@ -42,8 +37,6 @@ head_add_js('crypto.js'); head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.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. -- cgit v1.2.3 From e931af830701fdacc64e2cc014aa0057dc91e093 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 2 Mar 2014 15:47:01 -0800 Subject: first cut at choklet template --- view/php/choklet.php | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 view/php/choklet.php (limited to 'view/php') diff --git a/view/php/choklet.php b/view/php/choklet.php new file mode 100644 index 000000000..31b0b124c --- /dev/null +++ b/view/php/choklet.php @@ -0,0 +1,23 @@ + + + + <?php if(x($page,'title')) echo $page['title'] ?> + + + + +
+ +
+ +
+
+
+
+ +
+
+
+ + + -- cgit v1.2.3 From 895c9411d9393776f2ae4846935e42c31fde41af Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 2 Mar 2014 16:46:34 -0800 Subject: add choklet template with several defined flavours, two and three column fluid layouts with optional side margins and a region for a blog-style header photo --- view/php/choklet.php | 3 ++- view/php/default.php | 3 ++- view/php/full.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'view/php') diff --git a/view/php/choklet.php b/view/php/choklet.php index 31b0b124c..fcfaf7804 100644 --- a/view/php/choklet.php +++ b/view/php/choklet.php @@ -7,7 +7,8 @@
- +
+
diff --git a/view/php/default.php b/view/php/default.php index 3573bf829..fd29ef3db 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -6,7 +6,8 @@ - +
+
diff --git a/view/php/full.php b/view/php/full.php index d8643d5a1..99653c06d 100644 --- a/view/php/full.php +++ b/view/php/full.php @@ -6,7 +6,8 @@ - +
+
-- cgit v1.2.3 From e8da840eec218acab2e9d26ee33915679ac88b5c Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 7 Mar 2014 13:36:49 +0100 Subject: remove aside on navbar collapse and add button to toggle visibility --- view/php/default.php | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'view/php') diff --git a/view/php/default.php b/view/php/default.php index fd29ef3db..87b92161b 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -1,20 +1,21 @@ - - - - <?php if(x($page,'title')) echo $page['title'] ?> - - - - -
- - -
-
-
-
- -
- - - + + + + <?php if(x($page,'title')) echo $page['title'] ?> + + + + +
+ +
+ +
+
+
+
+ +
+ + + -- cgit v1.2.3