summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2014-04-07 16:46:25 +0200
committerChristophe Simonis <chs@openerp.com>2014-04-07 16:46:25 +0200
commitffae3807255269ff290bdf9fe62bc668feaade75 (patch)
tree8394d8bcb3e9fd3d79e7cabf0e5ffc7a3fe0a576 /addons/web/static/src/css
parent1e9ed7baf620b4d6eb6d5bed1cf7d4317d9c2c96 (diff)
parentd0b7e7fc7b5a5e91aee0b6aba3b48cae2fa4ff0a (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/css')
-rw-r--r--addons/web/static/src/css/base.css1
-rw-r--r--addons/web/static/src/css/base.sass1
2 files changed, 2 insertions, 0 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