[MERGE] Merged lp:openerp-web/7.0

bzr revid: bth@tinyerp.com-20130417073823-qh3hzbj2j70kt6c6
bzr revid: psa@tinyerp.com-20130517053130-09k6t1os2x6g8i0j
This commit is contained in:
Paramjit Singh Sahota
2013-05-17 11:01:30 +05:30
361 changed files with 3986 additions and 2321 deletions
+5 -5
View File
@@ -1269,7 +1269,7 @@
color: white;
padding: 2px 4px;
margin: 1px 6px 0 0;
border: 1px solid lightGray;
border: 1px solid lightgrey;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@@ -1301,7 +1301,7 @@
transform: scale(1.1);
}
.openerp .oe_secondary_submenu .oe_active {
border-top: 1px solid lightGray;
border-top: 1px solid lightgrey;
border-bottom: 1px solid #dedede;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -2288,7 +2288,7 @@
}
.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
font-size: 80%;
color: darkGreen;
color: darkgreen;
vertical-align: top;
position: relative;
top: -4px;
@@ -2472,10 +2472,10 @@
width: 7em;
}
.openerp .oe_form_editable .oe_form .oe_form_field_date input {
width: 7.5em;
width: 100px;
}
.openerp .oe_form_editable .oe_form .oe_form_field_datetime input {
width: 11.5em;
width: 150px;
}
.openerp .oe_hidden_input_file {
position: relative;