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

Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate

Browse Source
This commit is contained in:
Rushabh Mehta 2012-03-21 09:06:02 +01:00
commit 5bd00adeed
8 changed files with 55 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
css/all-app.css
View File

@ -11,7 +11,7 @@ body {
margin: 0px;
padding: 0px;
font-family: Arial, Helvetica, Sans;
font-size: 12px;
font-size: 14px;
color: #000;
background-color: #e2e2e2;
}
@ -1748,6 +1748,28 @@ div.stat-bar {
src: local('Droid Sans'), local('DroidSans'), url('../lib/css/fonts/droidsans.woff') format('woff');
}
@font-face {
font-family: 'PT Sans';
font-style: normal;
font-weight: normal;
src: local('PT Sans'), local('PTSans-Regular'), url('../lib/css/fonts/ptsans.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: local('Open Sans'), local('OpenSans'), url('../lib/css/fonts/opensans.woff') format('woff');
}
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 400;
src: local('Lato Regular'), local('Lato-Regular'), url('../lib/css/fonts/lato.woff') format('woff');
}
/*
* lib/css/bootstrap/headings.css
*/
@ -3469,13 +3491,13 @@ button.btn.small, input[type="submit"].btn.small {
* erpnext/startup/startup.css
*/
h1, h2, h3, h4, h5 {
font-family: Tahoma, Arial, Verdana, sans-serif;
font-family: "Lato", Helvetica, "Helvetica Neue", sans-serif;
font-weight: bold;
}
body {
font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
font-size: 12px;
font-family: "Lato", Helvetica, "Helvetica Neue", sans-serif;
font-size: 13px;
}
span, div, td, input, textarea, button, select {
@ -3486,6 +3508,10 @@ body {
background: url(../images/stripedbg.png) repeat;
}
.small {
font-size: 11.5px;
}
.erpnext-footer {
margin: 11px auto;
text-align: center;

12
css/all-web.css
View File

@ -11,7 +11,7 @@ body {
margin: 0px;
padding: 0px;
font-family: Arial, Helvetica, Sans;
font-size: 12px;
font-size: 14px;
color: #000;
background-color: #e2e2e2;
}
@ -1631,13 +1631,13 @@ button.btn.small, input[type="submit"].btn.small {
* erpnext/startup/startup.css
*/
h1, h2, h3, h4, h5 {
font-family: Tahoma, Arial, Verdana, sans-serif;
font-family: "Lato", Helvetica, "Helvetica Neue", sans-serif;
font-weight: bold;
}
body {
font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
font-size: 12px;
font-family: "Lato", Helvetica, "Helvetica Neue", sans-serif;
font-size: 13px;
}
span, div, td, input, textarea, button, select {
@ -1648,6 +1648,10 @@ body {
background: url(../images/stripedbg.png) repeat;
}
.small {
font-size: 11.5px;
}
.erpnext-footer {
margin: 11px auto;
text-align: center;

1
erpnext/home/page/desktop/desktop.css
View File

@ -62,7 +62,6 @@
.case-label {
color: white;
/*font-size: 12px;*/
padding-top: 10px;
text-align: center;
text-shadow: 0px 0px 3px #000, 0px 0px 3px #000, 0px 0px 2px #000;

10
erpnext/startup/startup.css
View File

@ -1,11 +1,11 @@
h1, h2, h3, h4, h5 {
font-family: Tahoma, Arial, Verdana, sans-serif;
font-family: "Lato", Helvetica, "Helvetica Neue", sans-serif;
font-weight: bold;
}
body {
font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
font-size: 12px;
font-family: "Lato", Helvetica, "Helvetica Neue", sans-serif;
font-size: 13px;
}
span, div, td, input, textarea, button, select {
@ -16,6 +16,10 @@ body {
background: url(../images/stripedbg.png) repeat;
}
.small {
font-size: 11.5px;
}
.erpnext-footer {
margin: 11px auto;
text-align: center;

6
erpnext/startup/startup.js
View File

@ -49,14 +49,14 @@ erpnext.startup.start = function() {
erpnext.startup.set_globals();
if(wn.boot.custom_css) {
set_style(wn.boot.custom_css);
}
if(wn.boot.user_background) {
erpnext.set_user_background(wn.boot.user_background);
}
if(user == 'Guest'){
if(wn.boot.custom_css) {
set_style(wn.boot.custom_css);
}
if(wn.boot.website_settings.title_prefix) {
wn.title_prefix = wn.boot.website_settings.title_prefix;
}

6
js/all-app.js
View File

@ -2197,9 +2197,9 @@ wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',f
var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'}
erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway)
if(inList(user_roles,'System Manager'))is_system_manager=1;}
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}}
$('#startup_div').toggle(false);}
show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);}

6
js/all-web.js
View File

@ -1235,9 +1235,9 @@ wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',f
var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'}
erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway)
if(inList(user_roles,'System Manager'))is_system_manager=1;}
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}}
$('#startup_div').toggle(false);}
show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);}

2
version.num
View File

@ -1 +1 @@
1300
1307