[MERGE] from trunk-openchatter-vive-lilo-chm

bzr revid: chm@openerp.com-20121129095214-pniv6qy0p2ea6efe
This commit is contained in:
Christophe Matthieu 2012-11-29 10:52:14 +01:00
commit f0c821ebbc
2 changed files with 12 additions and 8 deletions

View File

@ -2376,6 +2376,7 @@
width: 100%;
left: 2px;
top: 7px;
overflow: hidden;
}
.openerp .oe_fileupload .oe_add button {
display: inline;
@ -2402,10 +2403,11 @@
}
.openerp .oe_fileupload .oe_add input.oe_form_binary_file {
display: inline-block;
margin-left: -5px;
height: 28px;
width: 52px;
margin-top: -26px;
margin-left: -85px;
height: 22px;
width: 152px;
margin-top: -24px;
cursor: pointer;
}
.openerp .oe_fileupload .oe_add .oe_attach_label {
color: #7c7bad;

View File

@ -1900,6 +1900,7 @@ $sheet-padding: 16px
width: 100%
left: +2px
top: +7px
overflow: hidden
button
display: inline
height: 24px
@ -1922,10 +1923,11 @@ $sheet-padding: 16px
left: -9px
input.oe_form_binary_file
display: inline-block
margin-left: -5px
height: 28px
width: 52px
margin-top: -26px
margin-left: -85px
height: 22px
width: 152px
margin-top: -24px
cursor: pointer
.oe_attach_label
color: #7C7BAD
margin-left: -3px