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

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

Browse Source
This commit is contained in:
Rushabh Mehta 2012-02-27 19:05:44 +05:30
commit caebd1bff6
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@
} }
.case-border:active, .case-border:focus, .circle:active, .circle:focus { .case-border:active, .case-border:focus, .circle:active, .circle:focus {
box-shadow: 0 0 5px 2px black; box-shadow: 0 0 2px 0 black, 0 0 15px 2px white;
} }
@keyframes hover-effect @keyframes hover-effect
@ -113,11 +113,10 @@
.circle-text { .circle-text {
color: white; color: white;
font-size: 12px;
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
display: inline-block; display: inline-block;
margin-top: -2px; margin-top: -3px;
text-shadow: 1px 1px 5px #000; text-shadow: 1px 1px 5px #000;
} }

1
erpnext/patches/jan_mar_2012/navupdate.py
View File

@ -31,6 +31,7 @@ def execute():
reload_doc('home', 'page', 'desktop') reload_doc('home', 'page', 'desktop')
reload_doc('utilities', 'page', 'todo') reload_doc('utilities', 'page', 'todo')
reload_doc('utilities', 'page', 'calendar') reload_doc('utilities', 'page', 'calendar')
reload_doc('utilities', 'page', 'messages')
webnotes.conn.set_value('Control Panel', 'Control Panel', 'home_page', webnotes.conn.set_value('Control Panel', 'Control Panel', 'home_page',
'desktop') 'desktop')

2
erpnext/startup/startup.js
View File

@ -111,6 +111,8 @@ var update_messages = function() {
circle.toggle(false); circle.toggle(false);
} }
} }
} else {
clearInterval(wn.updates.id);
} }
} }
); );