Merge branch 'master' of github.com:webnotes/erpnext into customer-login

website/templates/css/blog_page.css

@@ -1,8 +1,4 @@
 	<style>
-		[itemprop="articleBody"] {
-			font-size: 120%;
-		}
-	
 		.comment-title {
 			color:#777;
 		}

website/templates/html/blog_footer.html

@@ -2,7 +2,7 @@
 	<hr />
 	{% if categories %}
 	<h5>Explore posts by categories</h5>
-	<ul class="breadcrumb" style="background-color: transparent; padding-left: 0px;">
+	<ul class="breadcrumb" style="background-color: transparent; padding-left: 20px;">
 	{% for category in categories %}
 		<li><a href="blog?category={{ category }}">{{ category }}</a> 
 	{% endfor %}

website/templates/html/outer.html

@@ -1,6 +1,7 @@
 {% extends "lib/templates/base.html" %}
 
 {% block body %}
+	{% include "app/website/templates/html/navbar.html" %}
 	<div class="container">
 		<div class="pull-right" style="margin:4px;" id="user-tools">
 			{% if shopping_cart_enabled -%}
@@ -22,7 +23,6 @@
 			<div class="col-md-12">{{ banner_html }}</div>
 		</div>{% endif %}
 		<div class="outer">
-			{% include "app/website/templates/html/navbar.html" %}
 			<div class="content row" id="page-{{ name }}" style="display: block;">
 			{%- block content -%}
 			{%- endblock -%}

website/templates/js/contact.js

@@ -27,7 +27,7 @@ $(document).ready(function() {
 			message: message,
 			callback: function(r) {
 				if(r.status==="okay") {
-					msgprint(r.message or "Sent")
+					msgprint(r.message || "Thank you for your message.")
 				} else {
 					msgprint("There were errors");
 					console.log(r.exc);

website/templates/pages/contact.html

@@ -32,7 +32,7 @@
 			</p>
 		</div>
 		{% if obj.doc.address %}
-		<div class="col-md-3 col-md-offset-1 alert" style="margin-top: 20px;" itemscope itemtype="http://schema.org/PostalAddress">
+		<div class="col-md-3 col-md-offset-1 alert alert-warning" style="margin-top: 20px;" itemscope itemtype="http://schema.org/PostalAddress">
 			<h4><i class="icon-map-marker"></i> {{ obj.address.address_title }}</h4>
 			{% if obj.address.address_line1 %}
 				<span itemprop="streetAddress">{{ obj.address.address_line1 }}</span><br>