Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
This commit is contained in:
commit
caebd1bff6
@ -76,7 +76,7 @@
|
||||
}
|
||||
|
||||
.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
|
||||
@ -113,11 +113,10 @@
|
||||
|
||||
.circle-text {
|
||||
color: white;
|
||||
font-size: 12px;
|
||||
vertical-align: middle;
|
||||
text-align: center;
|
||||
display: inline-block;
|
||||
margin-top: -2px;
|
||||
margin-top: -3px;
|
||||
text-shadow: 1px 1px 5px #000;
|
||||
}
|
||||
|
||||
|
@ -31,6 +31,7 @@ def execute():
|
||||
reload_doc('home', 'page', 'desktop')
|
||||
reload_doc('utilities', 'page', 'todo')
|
||||
reload_doc('utilities', 'page', 'calendar')
|
||||
reload_doc('utilities', 'page', 'messages')
|
||||
|
||||
webnotes.conn.set_value('Control Panel', 'Control Panel', 'home_page',
|
||||
'desktop')
|
||||
|
@ -111,6 +111,8 @@ var update_messages = function() {
|
||||
circle.toggle(false);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
clearInterval(wn.updates.id);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
@ -1 +1 @@
|
||||
741
|
||||
741
|
||||
|
Loading…
x
Reference in New Issue
Block a user