merge from trunk

bzr revid: mit@openerp.com-20120903111231-gpw527k8dvht5u3k
This commit is contained in:
Minh Tran
2012-09-03 13:12:31 +02:00
5 changed files with 15 additions and 15 deletions
+5 -1
View File
@@ -502,6 +502,7 @@
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
border: none;
margin-bottom: 10px;
}
.openerp .oe_avatar + div {
margin-left: 5px;
@@ -574,6 +575,9 @@
background: #7c7bad;
color: #eeeeee;
}
.openerp .oe_tags {
margin-bottom: 1px;
}
.openerp .oe_tags.oe_inline {
min-width: 250px;
}
@@ -2156,7 +2160,7 @@
.openerp .oe_form td.oe_form_group_cell_label label {
line-height: 18px;
display: block;
min-width: 160px;
min-width: 140px;
}
.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
padding-left: 6px;