Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
version.num
diff --git a/erpnext/home/page/desktop/desktop.css b/erpnext/home/page/desktop/desktop.css
index 01e2ea5..564a361 100644
--- a/erpnext/home/page/desktop/desktop.css
+++ b/erpnext/home/page/desktop/desktop.css
@@ -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;
}
diff --git a/version.num b/version.num
index 45b1cce..5588794 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-741
\ No newline at end of file
+741