diff options
| author | Martin Trigaux <mat@openerp.com> | 2014-04-07 14:06:12 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2014-04-07 14:06:12 +0200 |
| commit | d0b7e7fc7b5a5e91aee0b6aba3b48cae2fa4ff0a (patch) | |
| tree | 0afd91fe476771f2f772a17ee0999d42c90fcaba /addons/web | |
| parent | 5be9e5612f14916005c54226ee83e8510f3c12e4 (diff) | |
| parent | f1d96a12b05db9c287d9b74f0169112dd9e98411 (diff) | |
[MERGE] [FIX] upload widget: avoid overflow making impossible to click on other buttons than the first one (opw 603125)
bzr revid: mat@openerp.com-20140407120612-mjb08yts2oa4k4jz
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/static/src/css/base.css | 1 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 1 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 7c2bc81b9e3..34d6084eb9c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2488,6 +2488,7 @@ } .openerp .oe_hidden_input_file { position: relative; + overflow-x: hidden; } .openerp .oe_hidden_input_file input.oe_form_binary_file { z-index: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1c02018da9d..f57a002eb3c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1976,6 +1976,7 @@ $sheet-padding: 16px // Position: relative is used for the hidden input[type=file] // Do not remove it anymore ! position: relative + overflow-x: hidden input.oe_form_binary_file z-index: 0 line-height: 0 diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 2b8d6fe5efa..3c7e9eea500 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1240,7 +1240,6 @@ <td> <t t-call="HiddenInputFile"> <t t-set="fileupload_id" t-value="widget.fileupload_id"/> - <t t-set="fileupload_style" t-translation="off">width: 83px;</t> <button class="oe_button oe_field_button" type="button"> <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/> <span>Select</span> |