diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-11-29 10:52:14 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-11-29 10:52:14 +0100 |
| commit | f0c821ebbcac49666b9261050f1dd951b30a1676 (patch) | |
| tree | d84fba8ca4a810fa5e8589c269c6a0995010dfa2 /addons/web/static/src/css | |
| parent | 106100eea03c973e3ccc322ee32354b3ccb18d1e (diff) | |
| parent | 70bfb1453871b2f00371ffdd25c0959537ada0f5 (diff) | |
[MERGE] from trunk-openchatter-vive-lilo-chm
bzr revid: chm@openerp.com-20121129095214-pniv6qy0p2ea6efe
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 10 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 24a035a3050..a71a071db3b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -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; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 6d167709692..f634452a7ee 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -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 |