[major] upgrade to bootstrap 3

website/doctype/blog_post/blog_post.py

@@ -30,6 +30,7 @@ class DocType:
 
 	def prepare_template_args(self):
 		import webnotes.utils
+		import markdown2
 		
 		# this is for double precaution. usually it wont reach this code if not published
 		if not webnotes.utils.cint(self.doc.published):
@@ -65,3 +66,4 @@ class DocType:
 		self.doc.comment_list = comment_list or []
 		for comment in self.doc.comment_list:
 			comment['comment_date'] = webnotes.utils.global_date_format(comment['creation'])
+			comment['comment'] = markdown2.markdown(comment['comment'])

website/doctype/style_settings/custom_template.css

@@ -66,6 +66,10 @@ div.web-footer, div.web-footer a {
 }
 
 /* Bootstrap Navbar */
+.navbar-default {
+	border: 0px;
+}
+
 .navbar {
 	box-shadow: none;
 	border-radius: 0px;
@@ -166,8 +170,8 @@ div.web-footer, div.web-footer a {
   }
 
   .navbar .nav li.dropdown > .dropdown-toggle:hover .caret {
-    border-top-color: #{{ doc.top_bar_background }};
-    border-bottom-color: #{{ doc.top_bar_background }};
+    border-top-color: #{{ doc.top_bar_foreground }};
+    border-bottom-color: #{{ doc.top_bar_foreground }};
   }
 
   .navbar .nav li.dropdown.open > .dropdown-toggle .caret,
@@ -178,6 +182,10 @@ div.web-footer, div.web-footer a {
 
 }
 
+.navbar-default .navbar-toggle .icon-bar {
+	background-color: #{{ doc.top_bar_foreground }};
+}
+
 .breadcrumb {
 	background-color: #{{ get_hex_shade(doc.page_background, 10) }};
 }

website/doctype/style_settings/style_settings.js

@@ -6,7 +6,7 @@ cur_frm.cscript.onload_post_render = function() {
 	wn.require('lib/public/js/lib/jscolor/jscolor.js');
 	$.each(["background_color", "page_background", "page_text", "page_links", 
 		"top_bar_background", "top_bar_foreground", "page_headings"], function(i, v) {
-		cur_frm.fields_dict[v].input.className = 'color';
+		$(cur_frm.fields_dict[v].input).addClass('color');
 	})
 	jscolor.bind();
 }