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

fix in hover effect

Browse Source
This commit is contained in:
Anand Doshi 2012-02-27 19:16:24 +05:30
parent 2b8c4d78f3
commit ac144121ff
10 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
css/all-app.css
View File

@ -2866,7 +2866,8 @@ body {
.navbar-icon-home:hover, .navbar-icon-home:hover,
.navbar-icon-home:focus, .navbar-icon-home:focus,
.navbar-icon-home:active { .navbar-icon-home:active,
.navbar-icon-home-hover{
opacity:1; opacity:1;
Filter:alpha(opacity=100); /* For IE8 and earlier */ Filter:alpha(opacity=100); /* For IE8 and earlier */
} }

3
css/all-web.css
View File

@ -1674,7 +1674,8 @@ body {
.navbar-icon-home:hover, .navbar-icon-home:hover,
.navbar-icon-home:focus, .navbar-icon-home:focus,
.navbar-icon-home:active { .navbar-icon-home:active,
.navbar-icon-home-hover{
opacity:1; opacity:1;
Filter:alpha(opacity=100); /* For IE8 and earlier */ Filter:alpha(opacity=100); /* For IE8 and earlier */
} }

2
erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py
View File

@ -121,7 +121,7 @@ if customer_group or based_on == 'Customer Group':
# Territory # Territory
if territory or based_on == 'Territory': if territory or based_on == 'Territory':
add_tab += ' ,`tabTerritory` t11 ' add_tab += ' ,`tabTerritory` t11 '
add_cond += ' AND t1.territory = t11.name AND t1.territory = t11.name and (t11.name = "%s" or t11.name IN (SELECT t12.name FROM `tabTerritory` t12,`tabTerritory` t13 WHERE t12.lft BETWEEN t13.lft and t13.rgt and t12.docstatus !=2 and ifnull(t12.is_group,"No") = "No" and t13.name = "%s"))' % (based_on != 'Territory' and territory or '%(value)s', based_on != 'Territory' and territory or '%(value)s') add_cond += ' AND t1.territory = t11.name and (t11.name = "%s" or t11.name IN (SELECT t12.name FROM `tabTerritory` t12,`tabTerritory` t13 WHERE t12.lft BETWEEN t13.lft and t13.rgt and t12.docstatus !=2 and ifnull(t12.is_group,"No") = "No" and t13.name = "%s"))' % (based_on != 'Territory' and territory or '%(value)s', based_on != 'Territory' and territory or '%(value)s')
# Supplier # Supplier
if supplier or based_on == 'Supplier': if supplier or based_on == 'Supplier':

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

@ -65,36 +65,15 @@
/* Hover and click effects */ /* Hover and click effects */
.case-border:hover, .circle:hover { .case-border:hover, .circle:hover {
animation: hover-effect 0.1s; box-shadow: 0 0 2px 0px black, 0 0 10px 1px white;
-moz-animation: hover-effect 0.1s; /* Firefox */
-webkit-animation: hover-effect 0.05s; /* Safari and Chrome */
animation-timing-function:linear;
-moz-animation-timing-function:linear; /* Firefox */
-webkit-animation-timing-function:linear; /* Safari and Chrome */
box-shadow: 0 0 2px 0 black, 0 0 10px 1px white;
} }
.case-border:active, .case-border:focus, .circle:active, .circle:focus { .case-border:active, .case-border:focus, .circle:active, .circle:focus {
box-shadow: 0 0 2px 0 black, 0 0 15px 2px white; transform: scale(0.98, 0.98);
} -ms-transform: scale(0.98, 0.98); /* IE 9 */
-webkit-transform: scale(0.98, 0.98); /* Safari and Chrome */
@keyframes hover-effect -o-transform: scale(0.98, 0.98); /* Opera */
{ -moz-transform: scale(0.98, 0.98); /* Firefox */
from {box-shadow: 0 0 10px 1px black}
to {box-shadow: 0 0 2px 0 black, 0 0 10px 1px white;}
}
@-moz-keyframes hover-effect /* Firefox */
{
from {box-shadow: 0 0 10px 1px black}
to {box-shadow: 0 0 2px 0 black, 0 0 10px 1px white;}
}
@-webkit-keyframes hover-effect /* Safari and Chrome */
{
from {box-shadow: 0 0 10px 1px black}
to {box-shadow: 0 0 2px 0 black, 0 0 10px 1px white;}
} }
.circle { .circle {

2
erpnext/home/page/event_updates/event_updates.py
View File

@ -32,7 +32,7 @@ def get_unread_messages(arg=None):
return webnotes.conn.sql("""\ return webnotes.conn.sql("""\
SELECT name, comment SELECT name, comment
FROM `tabComment Widget Record` FROM `tabComment Widget Record`
WHERE comment_doctype='My Company' WHERE comment_doctype IN ('My Company', 'Message')
AND comment_docname = %s AND comment_docname = %s
AND ifnull(docstatus,0)=0 AND ifnull(docstatus,0)=0
""", webnotes.user.name, as_list=1) """, webnotes.user.name, as_list=1)

3
erpnext/startup/startup.css
View File

@ -70,7 +70,8 @@ body {
.navbar-icon-home:hover, .navbar-icon-home:hover,
.navbar-icon-home:focus, .navbar-icon-home:focus,
.navbar-icon-home:active { .navbar-icon-home:active,
.navbar-icon-home-hover{
opacity:1; opacity:1;
Filter:alpha(opacity=100); /* For IE8 and earlier */ Filter:alpha(opacity=100); /* For IE8 and earlier */
} }

5
js/all-app.js
View File

@ -2187,7 +2187,8 @@ get_window_height=function(){var ht=window.innerHeight?window.innerHeight:docume
* js/app.js * 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.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('<b>erp</b>next&nbsp;<i class="icon-home icon-white navbar-icon-home" ></i>');}) wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.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');});})
/* /*
* erpnext/startup/startup.js * erpnext/startup/startup.js
*/ */
@ -2206,7 +2207,7 @@ btn.help_page=help_page;}
if(callback)this.callback=function(){callback();}} if(callback)this.callback=function(){callback();}}
var update_messages=function(){if(inList(['Guest'],user)){return;} var update_messages=function(){if(inList(['Guest'],user)){return;}
$c_page('home','event_updates','get_unread_messages',null,function(r,rt){if(!r.exc){page_body.wntoolbar.set_new_comments(r.message);var circle=$('#msg_count') $c_page('home','event_updates','get_unread_messages',null,function(r,rt){if(!r.exc){page_body.wntoolbar.set_new_comments(r.message);var circle=$('#msg_count')
if(circle){if(r.message.length){circle.find('span:first').text(r.message.length);circle.toggle(true);}else{circle.toggle(false);}}}});} if(circle){if(r.message.length){circle.find('span:first').text(r.message.length);circle.toggle(true);}else{circle.toggle(false);}}}else{clearInterval(wn.updates.id);}});}
erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);}
wn.updates.id=setInterval(update_messages,60000);} wn.updates.id=setInterval(update_messages,60000);}
$(document).bind('startup',function(){erpnext.startup.start();}); $(document).bind('startup',function(){erpnext.startup.start();});

5
js/all-web.js
View File

@ -1035,7 +1035,8 @@ get_window_height=function(){var ht=window.innerHeight?window.innerHeight:docume
* js/app.js * 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:'&copy; Web Notes Technologies Pvt Ltd',version:'2.'+window._version_number} 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:'&copy; 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('<b>erp</b>next&nbsp;<i class="icon-home icon-white navbar-icon-home" ></i>');}) wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.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');});})
/* /*
* erpnext/startup/startup.js * erpnext/startup/startup.js
*/ */
@ -1054,7 +1055,7 @@ btn.help_page=help_page;}
if(callback)this.callback=function(){callback();}} if(callback)this.callback=function(){callback();}}
var update_messages=function(){if(inList(['Guest'],user)){return;} var update_messages=function(){if(inList(['Guest'],user)){return;}
$c_page('home','event_updates','get_unread_messages',null,function(r,rt){if(!r.exc){page_body.wntoolbar.set_new_comments(r.message);var circle=$('#msg_count') $c_page('home','event_updates','get_unread_messages',null,function(r,rt){if(!r.exc){page_body.wntoolbar.set_new_comments(r.message);var circle=$('#msg_count')
if(circle){if(r.message.length){circle.find('span:first').text(r.message.length);circle.toggle(true);}else{circle.toggle(false);}}}});} if(circle){if(r.message.length){circle.find('span:first').text(r.message.length);circle.toggle(true);}else{circle.toggle(false);}}}else{clearInterval(wn.updates.id);}});}
erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);}
wn.updates.id=setInterval(update_messages,60000);} wn.updates.id=setInterval(update_messages,60000);}
$(document).bind('startup',function(){erpnext.startup.start();}); $(document).bind('startup',function(){erpnext.startup.start();});

8
js/app.js
View File

@ -31,5 +31,11 @@ $(document).bind('ready', function() {
}); });
$(document).bind('toolbar_setup', function() { $(document).bind('toolbar_setup', function() {
$('.brand').html('<b>erp</b>next&nbsp;<i class="icon-home icon-white navbar-icon-home" ></i>'); $('.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');
});
}) })

2
version.num
View File

@ -1 +1 @@
741 747