diff --git a/css/all-app.css b/css/all-app.css index 1ac971c70c9..5ca655eb9de 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -2085,12 +2085,6 @@ button.btn.small, input[type="submit"].btn.small { right: 13px; } -/*extra size menus for recent*/ -.dropdown-menu#toolbar-recent, .dropdown-menu#toolbar-options, .dropdown-menu#toolbar-help{ - width: 260px !important; - max-width: 260px !important; -} - /* ajax spinner */ .navbar #spinner { display: block; @@ -2104,6 +2098,7 @@ button.btn.small, input[type="submit"].btn.small { .navbar-inner { padding: 0px 20px; } + /* * lib/css/bootstrap/dropdown.css */.dropdown { @@ -2840,11 +2835,41 @@ body { .navbar-new-comments { margin: -3px 0px; padding: 2px; - font-size: 14px; - color: #fff; - background-color: #B00D07; min-width: 20px; text-align: center; display: inline-block; border-radius: 2px; + color: #999999; + background-color: #333131; +} + +.navbar-new-comments:hover, +.navbar-new-comments:active, +.navbar-new-comments:focus { + color: #fff; +} + + +.navbar-new-comments-true { + color: #fff; + background-color: #B00D07; +} + +.navbar-icon-home { + vertical-align: middle; + opacity:0.4; + Filter:alpha(opacity=40); /* For IE8 and earlier */ +} + +.navbar-icon-home:hover, +.navbar-icon-home:focus, +.navbar-icon-home:active { + opacity:1; + Filter:alpha(opacity=100); /* For IE8 and earlier */ +} + +/*extra size menus for recent*/ +.dropdown-menu#toolbar-recent, .dropdown-menu#toolbar-options, .dropdown-menu#toolbar-help{ + min-width: 160px !important; + max-width: 260px !important; } diff --git a/css/all-web.css b/css/all-web.css index 0ac96aada27..1bb9c886b61 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -1313,12 +1313,6 @@ button.btn.small, input[type="submit"].btn.small { right: 13px; } -/*extra size menus for recent*/ -.dropdown-menu#toolbar-recent, .dropdown-menu#toolbar-options, .dropdown-menu#toolbar-help{ - width: 260px !important; - max-width: 260px !important; -} - /* ajax spinner */ .navbar #spinner { display: block; @@ -1332,6 +1326,7 @@ button.btn.small, input[type="submit"].btn.small { .navbar-inner { padding: 0px 20px; } + /* * lib/css/bootstrap/dropdown.css */.dropdown { @@ -1648,13 +1643,43 @@ body { .navbar-new-comments { margin: -3px 0px; padding: 2px; - font-size: 14px; - color: #fff; - background-color: #B00D07; min-width: 20px; text-align: center; display: inline-block; border-radius: 2px; + color: #999999; + background-color: #333131; +} + +.navbar-new-comments:hover, +.navbar-new-comments:active, +.navbar-new-comments:focus { + color: #fff; +} + + +.navbar-new-comments-true { + color: #fff; + background-color: #B00D07; +} + +.navbar-icon-home { + vertical-align: middle; + opacity:0.4; + Filter:alpha(opacity=40); /* For IE8 and earlier */ +} + +.navbar-icon-home:hover, +.navbar-icon-home:focus, +.navbar-icon-home:active { + opacity:1; + Filter:alpha(opacity=100); /* For IE8 and earlier */ +} + +/*extra size menus for recent*/ +.dropdown-menu#toolbar-recent, .dropdown-menu#toolbar-options, .dropdown-menu#toolbar-help{ + min-width: 160px !important; + max-width: 260px !important; } /* diff --git a/erpnext/home/page/desktop/desktop.js b/erpnext/home/page/desktop/desktop.js index 9400cfe4222..e2a8d5386e0 100644 --- a/erpnext/home/page/desktop/desktop.js +++ b/erpnext/home/page/desktop/desktop.js @@ -78,7 +78,7 @@ erpnext.desktop.render = function() { } erpnext.desktop.show_pending_notifications = function() { - $('#messages a:first').prepend('
\ + $('#messages a:first').prepend('
\
'); $('#msg_count').toggle(false); update_messages(); diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css index 6410ccc74d1..27fda486584 100644 --- a/erpnext/startup/startup.css +++ b/erpnext/startup/startup.css @@ -42,11 +42,41 @@ body { .navbar-new-comments { margin: -3px 0px; padding: 2px; - font-size: 14px; - color: #fff; - background-color: #B00D07; min-width: 20px; text-align: center; display: inline-block; border-radius: 2px; + color: #999999; + background-color: #333131; +} + +.navbar-new-comments:hover, +.navbar-new-comments:active, +.navbar-new-comments:focus { + color: #fff; +} + + +.navbar-new-comments-true { + color: #fff; + background-color: #B00D07; +} + +.navbar-icon-home { + vertical-align: middle; + opacity:0.4; + Filter:alpha(opacity=40); /* For IE8 and earlier */ +} + +.navbar-icon-home:hover, +.navbar-icon-home:focus, +.navbar-icon-home:active { + opacity:1; + Filter:alpha(opacity=100); /* For IE8 and earlier */ +} + +/*extra size menus for recent*/ +.dropdown-menu#toolbar-recent, .dropdown-menu#toolbar-options, .dropdown-menu#toolbar-help{ + min-width: 160px !important; + max-width: 260px !important; } diff --git a/erpnext/startup/toolbar.js b/erpnext/startup/toolbar.js index 57a57079641..c73d54ed38d 100644 --- a/erpnext/startup/toolbar.js +++ b/erpnext/startup/toolbar.js @@ -27,11 +27,11 @@ erpnext.toolbar.setup = function() { $('#toolbar-user').append('
  • Team / Messages
    • '); - $('.navbar .pull-right').prepend('\ -
    • '); + $('.navbar .pull-right').append('\ +
    • '); // help - $('.navbar .pull-right').append('
  • \ + $('.navbar .pull-right').prepend('
  • \ Help\ \ -
    • ').insertAfter('li[data-name="navbar-home"]'); + ').prependTo('.navbar .nav:first'); $('.navbar .nav:first') } diff --git a/js/all-app.js b/js/all-app.js index c3ce62f9510..095514f3865 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -1320,7 +1320,7 @@ if(rd[1]){var dt=rd[0];var dn=rd[1];this.add(dt,dn,0);}}}}); /* * lib/js/wn/ui/toolbar/toolbar.js */ -wn.ui.toolbar.Toolbar=Class.extend({init:function(){this.make();this.make_home();this.make_document();this.make_apps();wn.ui.toolbar.recent=new wn.ui.toolbar.RecentDocs();this.make_tools();this.set_user_name();this.make_logout();$('.dropdown-toggle').dropdown();$(document).trigger('toolbar_setup');},make:function(){$('header').append('
    \ +wn.ui.toolbar.Toolbar=Class.extend({init:function(){this.make();this.make_home();this.make_document();wn.ui.toolbar.recent=new wn.ui.toolbar.RecentDocs();this.make_tools();this.set_user_name();this.make_logout();$('.dropdown-toggle').dropdown();$(document).trigger('toolbar_setup');},make:function(){$('header').append('
    \
    \
    \ \ @@ -1337,8 +1337,7 @@ wn.ui.toolbar.Toolbar=Class.extend({init:function(){this.make();this.make_home() \
    \
    \ -
    ');},make_home:function(){$('.navbar .nav:first').append('
  • \ - Home
    • ');$('.navbar .brand').attr('href',"#!"+home_page);},make_document:function(){wn.ui.toolbar.new_dialog=new wn.ui.toolbar.NewDialog();wn.ui.toolbar.search=new wn.ui.toolbar.Search();wn.ui.toolbar.report=new wn.ui.toolbar.Report();$('.navbar .nav:first').append('
  • \ +
    • ');},make_home:function(){$('.navbar .brand').attr('href',"#!"+home_page);},make_document:function(){wn.ui.toolbar.new_dialog=new wn.ui.toolbar.NewDialog();wn.ui.toolbar.search=new wn.ui.toolbar.Search();wn.ui.toolbar.report=new wn.ui.toolbar.Report();$('.navbar .nav:first').append('
  • \ Document\ \
    • ');if(has_common(user_roles,['Administrator','System Manager'])){$('#toolbar-tools').append('
  • \ - Download Backup
    • ');}},make_apps:function(){$('.navbar .nav:first').append('
  • \ - Apps\ - \ -
    • ');},set_user_name:function(){var fn=user_fullname;if(fn.length>15)fn=fn.substr(0,12)+'...';$('#toolbar-user-link').html(fn+'');},make_logout:function(){$('#toolbar-user').append('
  • Logout
    • ');}});wn.ui.toolbar.clear_cache=function(){localStorage&&localStorage.clear();$c('webnotes.session_cache.clear',{},function(r,rt){show_alert(r.message);});return false;} + Download Backup');}},set_user_name:function(){var fn=user_fullname;if(fn.length>15)fn=fn.substr(0,12)+'...';$('#toolbar-user-link').html(fn+'');},make_logout:function(){$('#toolbar-user').append('
  • Logout
    • ');}});wn.ui.toolbar.clear_cache=function(){localStorage&&localStorage.clear();$c('webnotes.session_cache.clear',{},function(r,rt){show_alert(r.message);});return false;} wn.ui.toolbar.download_backup=function(){$c('webnotes.utils.backups.get_backup',{},function(r,rt){});return false;} wn.ui.toolbar.show_about=function(){try{wn.require('lib/js/wn/misc/about.js');wn.ui.misc.about();}catch(e){console.log(e);} return false;} @@ -2203,7 +2193,7 @@ get_window_height=function(){var ht=window.innerHeight?window.innerHeight:docume * js/app.js */ wn.app={name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'© Web Notes Technologies Pvt Ltd',version:'2.'+window._version_number} -wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.brand').html('erpnext');}) +wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.brand').html('erpnext ');}) /* * erpnext/startup/startup.js */ @@ -2237,8 +2227,8 @@ erpnext.module_page.make_list=function(module,wrapper){wrapper.list=new wn.widge /* * erpnext/startup/toolbar.js */ -wn.provide('erpnext.toolbar');erpnext.toolbar.setup=function(){erpnext.toolbar.add_modules();$('#toolbar-user').append('
  • Profile Settings
    • ');$('#toolbar-user').append('
  • Team / Messages
    • ');$('.navbar .pull-right').prepend('\ -
    • ');$('.navbar .pull-right').append('
  • \ +wn.provide('erpnext.toolbar');erpnext.toolbar.setup=function(){erpnext.toolbar.add_modules();$('#toolbar-user').append('
  • Profile Settings
    • ');$('#toolbar-user').append('
  • Team / Messages
    • ');$('.navbar .pull-right').append('\ +
    • ');$('.navbar .pull-right').prepend('
  • \ Help\ \ -
    • ').insertAfter('li[data-name="navbar-home"]');$('.navbar .nav:first')} + ').prependTo('.navbar .nav:first');$('.navbar .nav:first')} /* * erpnext/startup/feature_setup.js */ diff --git a/js/all-web.js b/js/all-web.js index f5f82ee1906..1eedb572c0e 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -1038,7 +1038,7 @@ get_window_height=function(){var ht=window.innerHeight?window.innerHeight:docume * js/app.js */ wn.app={name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'© Web Notes Technologies Pvt Ltd',version:'2.'+window._version_number} -wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.brand').html('erpnext');}) +wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.brand').html('erpnext ');}) /* * erpnext/startup/startup.js */ diff --git a/js/app.js b/js/app.js index 3e6fa5bcc0e..67f900f2bbf 100644 --- a/js/app.js +++ b/js/app.js @@ -31,5 +31,5 @@ $(document).bind('ready', function() { }); $(document).bind('toolbar_setup', function() { - $('.brand').html('erpnext'); -}) \ No newline at end of file + $('.brand').html('erpnext '); +}) diff --git a/version.num b/version.num index 3873f56298e..ddc27b0c1a3 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -706 \ No newline at end of file +739 \ No newline at end of file