Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css
index e2c0db5..fcb2276 100644
--- a/website/doctype/style_settings/custom_template.css
+++ b/website/doctype/style_settings/custom_template.css
@@ -76,9 +76,13 @@
box-shadow: none;
}
-{% if doc.top_bar_background == doc.page_background %}.navbar-inner {
- border-bottom: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 15) }};
-}{% endif %}
+.navbar-inner {
+ border-bottom: 1px solid {% if doc.top_bar_background == doc.page_background -%}
+ #{{ get_hex_shade(doc.page_background or "ffffff", 15) }};
+ {%- else -%}
+ transparent;
+ {%- endif %}
+}
.navbar-inverse .brand,
.navbar-inverse .brand:hover,