mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-07 23:31:20 +00:00
fixed confilct
This commit is contained in:
384
js/all-app.js
384
js/all-app.js
File diff suppressed because one or more lines are too long
226
js/all-web.js
226
js/all-web.js
File diff suppressed because one or more lines are too long
26
js/app.js
26
js/app.js
@@ -1,3 +1,19 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
wn.app = {
|
||||
name: 'ERPNext',
|
||||
license: 'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',
|
||||
@@ -15,5 +31,11 @@ $(document).bind('ready', function() {
|
||||
});
|
||||
|
||||
$(document).bind('toolbar_setup', function() {
|
||||
$('.brand').html('<b>erp</b>next');
|
||||
})
|
||||
$('.brand').html('<b>erp</b>next\
|
||||
<i class="icon-home icon-white navbar-icon-home" ></i>')
|
||||
.hover(function() {
|
||||
$(this).find('.icon-home').addClass('navbar-icon-home-hover');
|
||||
}, function() {
|
||||
$(this).find('.icon-home').removeClass('navbar-icon-home-hover');
|
||||
});
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user