From c75eaa2e3cdb031d98bd1ee1b692eb17edea6575 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 26 Mar 2013 15:56:47 +0530 Subject: [PATCH 1/2] [print] [fix] added utf-8 metatag --- website/doctype/style_settings/custom_template.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css index e2c0db598a..fcb2276ca0 100644 --- a/website/doctype/style_settings/custom_template.css +++ b/website/doctype/style_settings/custom_template.css @@ -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, From e9ef6be57f4c7d8db817d6c226729725f1fb7245 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 26 Mar 2013 17:15:49 +0530 Subject: [PATCH 2/2] [rename] [feature] added merge feature to rename_doc --- accounts/page/accounts_browser/accounts_browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js index 97c8554ac8..2e8cc820a6 100644 --- a/accounts/page/accounts_browser/accounts_browser.js +++ b/accounts/page/accounts_browser/accounts_browser.js @@ -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() {