diff options
| author | tsabi <csaba.toth@i3rendszerhaz.hu> | 2012-11-29 12:41:32 +0100 |
|---|---|---|
| committer | tsabi <csaba.toth@i3rendszerhaz.hu> | 2012-11-29 12:41:32 +0100 |
| commit | 76ca47d4fd0bd178fd7dfd2ea5b534d4e878a6f5 (patch) | |
| tree | 32339ef0c6869f21bb757f8ab6bce7faf8028c6b /addons/web/static/src/css | |
| parent | e2435d4f004a20636aef8a8ee2cc03c8cfc3e78c (diff) | |
| parent | c7772fdd82105ddf60cbec2517753bf927ce19ed (diff) | |
[MERGE] trunk
bzr revid: csaba.toth@i3rendszerhaz.hu-20121129114132-gfe3sn1p5t0mzofm
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 12 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index ee81492b8ad..a71a071db3b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2348,7 +2348,7 @@ .openerp .oe_form .oe_form_field_image .oe_form_field_image_controls { position: absolute; top: 1px; - padding: 4px; + padding: 4px 0; width: 100%; display: none; text-align: center; @@ -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 3923fcaf2ff..f634452a7ee 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1880,7 +1880,7 @@ $sheet-padding: 16px .oe_form_field_image_controls position: absolute top: 1px - padding: 4px + padding: 4px 0 width: 100% display: none text-align: center @@ -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 |