mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-24 07:29:22 +00:00
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts: version.num
This commit is contained in:
@@ -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 {
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
1667
|
1667
|
||||||
|
|||||||
Reference in New Issue
Block a user