From 983a17156748adf435f0fb8e31f4145c0569ed9b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 21 Mar 2012 13:35:34 +0530 Subject: [PATCH] using font lato --- css/all-app.css | 34 +++++++++++++++++++++++---- css/all-web.css | 12 ++++++---- erpnext/home/page/desktop/desktop.css | 1 - erpnext/startup/startup.css | 10 +++++--- erpnext/startup/startup.js | 6 ++--- js/all-app.js | 6 ++--- js/all-web.js | 6 ++--- version.num | 2 +- 8 files changed, 55 insertions(+), 22 deletions(-) diff --git a/css/all-app.css b/css/all-app.css index 5e74fa2ef8..25f02edd8f 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -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; diff --git a/css/all-web.css b/css/all-web.css index 03a92e4957..89ee1bba48 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -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; diff --git a/erpnext/home/page/desktop/desktop.css b/erpnext/home/page/desktop/desktop.css index 874f11b212..8d0df38628 100644 --- a/erpnext/home/page/desktop/desktop.css +++ b/erpnext/home/page/desktop/desktop.css @@ -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; diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css index 225e444466..4a47aedc95 100644 --- a/erpnext/startup/startup.css +++ b/erpnext/startup/startup.css @@ -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; diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 95c792483f..925c85e6d5 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -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; } diff --git a/js/all-app.js b/js/all-app.js index a8a1183f2d..106ed1b672 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -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);} diff --git a/js/all-web.js b/js/all-web.js index 93d77bb704..86bd989da5 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -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);} diff --git a/version.num b/version.num index 16b75613eb..6f6edaeeca 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -1300 \ No newline at end of file +1307 \ No newline at end of file