nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 15:47:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	version.num
This commit is contained in:
Anand Doshi
2012-03-01 19:28:36 +05:30
parent e306a1f5e1 06292433a6
commit 1e9b15eb5d
14 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/startup/startup.css
View File

@@ -13,6 +13,7 @@ span, div, td, input, textarea, button, select {
}
body {
background: url(../images/stripedbg.png) repeat;
}
.erpnext-footer {

3
erpnext/startup/startup.js
View File

@@ -46,6 +46,7 @@ erpnext.startup.set_globals = function() {
erpnext.startup.start = function() {
$('#startup_div').html('Starting up...').toggle(true);
erpnext.startup.set_globals();
if(wn.boot.custom_css) {
@@ -149,8 +150,6 @@ erpnext.set_user_background = function(src) {
set_style(repl('body { background: url("files/%(src)s") repeat !important;}', {src:src}))
}
// =======================================
// start
$(document).bind('startup', function() {
erpnext.startup.start();