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

Conflicts:
	version.num
This commit is contained in:
Anand Doshi 2012-04-12 12:28:21 +05:30
commit db695ecbf4
3 changed files with 7 additions and 7 deletions

View File

@ -214,9 +214,9 @@ div.std-footer-item {
padding: 15px;
background-color: #FFF;
min-height: 600px;
-moz-box-shadow: 4px 0px 3px #ddd;
-webkit-box-shadow: 4px 0px 3px #ddd;
box-shadow: 4px 0px 3px #ddd;
-moz-box-shadow: 2px 0px 1px #ddd;
-webkit-box-shadow: 2px 0px 1px #ddd;
box-shadow: 2px 0px 1px #ddd;
}
.layout-side-section {

View File

@ -214,9 +214,9 @@ div.std-footer-item {
padding: 15px;
background-color: #FFF;
min-height: 600px;
-moz-box-shadow: 4px 0px 3px #ddd;
-webkit-box-shadow: 4px 0px 3px #ddd;
box-shadow: 4px 0px 3px #ddd;
-moz-box-shadow: 2px 0px 1px #ddd;
-webkit-box-shadow: 2px 0px 1px #ddd;
box-shadow: 2px 0px 1px #ddd;
}
.layout-side-section {