Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait 2013-03-26 17:44:17 +05:30
commit d1d7de2b43
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/page/accounts_browser/accounts_browser.js
View File

@ -159,7 +159,7 @@ erpnext.AccountsChart = Class.extend({
rename: function() {
var node = this.selected_node();
wn.model.rename_doc(this.ctype, node.data('label'), function(new_name) {
node.data('label', new_name).find(".tree-label").html(new_name);
node.parents("ul:first").parent().find(".tree-link:first").trigger("reload");
});
},
delete: function() {

10
website/doctype/style_settings/custom_template.css
View File

@ -76,9 +76,13 @@ div.web-footer, div.web-footer a {
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,