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

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/all-app.css
View File

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

6
css/all-web.css
View File

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

2
version.num
View File

@ -1 +1 @@
1667 1667