diff --git a/patches/patch_list.py b/patches/patch_list.py index 176f4f8efd..0c2a523fb3 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -18,9 +18,9 @@ from __future__ import unicode_literals patch_list = [ "execute:webnotes.reload_doc('core', 'doctype', 'docfield') #2013-07-15", "execute:webnotes.reload_doc('core', 'doctype', 'docperm') #2013-07-15", - "execute:webnotes.reload_doc('core', 'doctype', 'report') #2013-07-15", "execute:webnotes.reload_doc('core', 'doctype', 'doctype') #2013-07-15", "execute:webnotes.reload_doc('core', 'doctype', 'page') #2013-07-15", + "execute:webnotes.reload_doc('core', 'doctype', 'report') #2013-07-15", "patches.mar_2012.clean_property_setter", "patches.april_2012.naming_series_patch", "patches.mar_2012.cleanup_control_panel", diff --git a/public/js/conf.js b/public/js/conf.js index 71f1fa6f2e..57f4b442bf 100644 --- a/public/js/conf.js +++ b/public/js/conf.js @@ -16,7 +16,8 @@ wn.modules_path = 'erpnext'; // add toolbar icon $(document).bind('toolbar_setup', function() { $('.navbar-brand').html('erpnext') + class="toolbar-splash" type="image/svg+xml">' + + (wn.boot.website_settings.brand_html || 'erpnext')) .css('max-width', '200px').css('overflow', 'hidden') .hover(function() { $(this).find('.icon-home').addClass('navbar-icon-home-hover'); diff --git a/public/js/startup.css b/public/js/startup.css index 2506868ecd..835e2bd8b6 100644 --- a/public/js/startup.css +++ b/public/js/startup.css @@ -37,5 +37,5 @@ span, div, td, input, textarea, button, select { .toolbar-splash { width: 32px; height: 32px; - margin: -11px auto; + margin: -10px auto; } \ No newline at end of file