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 208c7dd..f4038fb 100644
--- a/website/doctype/style_settings/custom_template.css
+++ b/website/doctype/style_settings/custom_template.css
@@ -53,11 +53,13 @@
border-radius: 5px;
}
{% else %}
+{% if doc.background_color == doc.page_background %}
div.web-footer {
border-top: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 15) }};
padding-top: 10px;
}
{% endif %}
+{% endif %}
/* Bootstrap Navbar */
.navbar-inverse .navbar-inner {
@@ -67,6 +69,14 @@
background-image: none;
}
+.navbar-inner {
+ 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-inverse .brand,
.navbar-inverse .brand:hover,
.navbar-inverse .brand:focus,
@@ -172,9 +182,22 @@
}
.breadcrumb {
- background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 5) }};
+ background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 10) }};
}
+.breadcrumb > li {
+ text-shadow: none;
+}
+
+.breadcrumb > li > .divider {
+ color: #{{ doc.page_text }};
+}
+
+.breadcrumb > .active {
+ color: #{{ doc.page_text }};
+}
+
+
.table-striped tbody > tr:nth-child(odd) > td,
.table-striped tbody > tr:nth-child(odd) > th {
background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 5) }};