Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/setup/doctype/company/company.py b/setup/doctype/company/company.py
index ae2d8ee..8a10587 100644
--- a/setup/doctype/company/company.py
+++ b/setup/doctype/company/company.py
@@ -77,12 +77,6 @@
website_settings.doclist.append({
"doctype": "Top Bar Item",
"parentfield": "top_bar_items",
- "label":"Home",
- "url": webpage.doc.name
- })
- website_settings.doclist.append({
- "doctype": "Top Bar Item",
- "parentfield": "top_bar_items",
"label":"Contact",
"url": "contact"
})
diff --git a/website/templates/html/navbar.html b/website/templates/html/navbar.html
index 9166cde..68706ec 100644
--- a/website/templates/html/navbar.html
+++ b/website/templates/html/navbar.html
@@ -1,5 +1,5 @@
<div class="navbar">
- {%- if brand_html %}<a class="navbar-brand" href="index">{{ brand_html }}</a>{% endif -%}
+ <a class="navbar-brand" href="index">{{ brand_html or "<i class='icon-home'></i>"}}</a>
<div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse"
data-target=".navbar-responsive-collapse">