[MERGE] Merged with latest trunk.

bzr revid: vta@openerp.com-20120904124152-6j1n6oz9wo6sig0x
This commit is contained in:
vta vta@openerp.com
2012-09-04 14:41:52 +02:00
7 changed files with 60 additions and 26 deletions
+14 -9
View File
@@ -237,6 +237,9 @@
.openerp .ui-widget-content a {
color: #7c7bad;
}
.openerp .oe_bounce_container {
display: inline-block;
}
.openerp.ui-dialog {
display: none;
padding: 6px;
@@ -520,9 +523,9 @@
padding: 0;
margin: 0;
background: none;
-moz-border-radius: none;
-webkit-border-radius: none;
border-radius: none;
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
@@ -535,9 +538,9 @@
padding: 0;
margin: 0;
background: none;
-moz-border-radius: none;
-webkit-border-radius: none;
border-radius: none;
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
@@ -2480,10 +2483,11 @@
height: 27px;
}
.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
border: 1px solid #aaaaff;
border-radius: 0px;
margin: 0px;
-webkit-border-radius: 0px;
margin: 0;
}
.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
height: 60px;
@@ -2583,6 +2587,7 @@
cursor: pointer;
}
.openerp .oe_list_content > tbody > tr {
height: 27px;
border-top: 1px solid #dddddd;
}
.openerp .oe_list_content > tbody > tr > td.oe_list_field_cell {