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

2012-04-13 12:18:26 +05:30 · 2012-04-13 12:18:26 +05:30 · 2a0d0213b0
commit 2a0d0213b0
parent 7fca9e617d 143291db5b
3 changed files with 9 additions and 1 deletions
--- a/css/all-app.css
+++ b/css/all-app.css
@ -203,6 +203,10 @@ div.std-footer-item {
 	overflow: hidden;
 }

+.layout-wrapper-appframe {
+	padding: 0px;
+}
+
 .layout-wrapper-background {
 	background-color: #fafafa !important;
 	padding: 0px;
--- a/css/all-web.css
+++ b/css/all-web.css
@ -203,6 +203,10 @@ div.std-footer-item {
 	overflow: hidden;
 }

+.layout-wrapper-appframe {
+	padding: 0px;
+}
+
 .layout-wrapper-background {
 	background-color: #fafafa !important;
 	padding: 0px;
--- a/version.num
+++ b/version.num
@ -1 +1 @@
-1683
+1684