diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-04-07 16:46:25 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-04-07 16:46:25 +0200 |
| commit | ffae3807255269ff290bdf9fe62bc668feaade75 (patch) | |
| tree | 8394d8bcb3e9fd3d79e7cabf0e5ffc7a3fe0a576 /addons/web/static/src | |
| parent | 1e9ed7baf620b4d6eb6d5bed1cf7d4317d9c2c96 (diff) | |
| parent | d0b7e7fc7b5a5e91aee0b6aba3b48cae2fa4ff0a (diff) | |
[MERGE] forward port of branch 7.0 up to revid 4169 mat@openerp.com-20140407120612-mjb08yts2oa4k4jz
bzr revid: chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407144625-jfimvsx4mgrkztqv
Diffstat (limited to 'addons/web/static/src')
| -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 8c2da02d969..08367d0e026 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2364,6 +2364,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 b18e4fc65d8..ff57906ed7e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1922,6 +1922,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 80b82c1f40b..9bce448ba0d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1252,7 +1252,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> |