diff --git a/frappe/boot.py b/frappe/boot.py index 20d5b2f0bf..6a88bbc091 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -69,7 +69,6 @@ def get_bootinfo(): bootinfo['versions'] = {k: v['version'] for k, v in get_versions().items()} bootinfo.error_report_email = frappe.get_hooks("error_report_email") - bootinfo.default_background_image = "/assets/frappe/images/ui/into-the-dawn.jpg" bootinfo.calendars = sorted(frappe.get_hooks("calendars")) return bootinfo diff --git a/frappe/public/images/ui/into-the-dawn.jpg b/frappe/public/images/ui/into-the-dawn.jpg deleted file mode 100644 index cfcd4ce636..0000000000 Binary files a/frappe/public/images/ui/into-the-dawn.jpg and /dev/null differ diff --git a/frappe/public/js/frappe/misc/user.js b/frappe/public/js/frappe/misc/user.js index 306ee555d3..a4ba377e0c 100644 --- a/frappe/public/js/frappe/misc/user.js +++ b/frappe/public/js/frappe/misc/user.js @@ -62,13 +62,21 @@ frappe.get_gravatar = function(email_id) { frappe.ui.set_user_background = function(src, selector, style) { if(!selector) selector = "#page-desktop"; if(!style) style = "Fill Screen"; - if(!src) src = frappe.urllib.get_full_url(frappe.boot.default_background_image); + if(src) { + var background = repl('background: url("%(src)s") center center;', {src: src}); + } else { + var background = "background-color: #4B4C9D;"; + } frappe.dom.set_style(repl('%(selector)s { \ - background: url("%(src)s") center center;\ + %(background)s \ background-attachment: fixed; \ %(style)s \ - }', {src:src, selector:selector, style: style==="Fill Screen" ? "background-size: cover;" : ""})); + }', { + selector:selector, + background:background, + style: style==="Fill Screen" ? "background-size: cover;" : "" + })); } frappe.provide('frappe.user');