summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
authorGery Debongnie <ged@openerp.com>2014-04-10 15:34:08 +0200
committerGery Debongnie <ged@openerp.com>2014-04-10 15:34:08 +0200
commite52841aab3be99887ea28827bf35a9ea5298dcff (patch)
tree4660a1f963c1020c00b6309a16a084f4701fdd53 /addons/web/static/src/css
parentf966931b879a1ed3cdc54b644c2e73456244c201 (diff)
parente521085fff15e06fea09353c0a531b93874a25e0 (diff)
[MERGE] merge from trunk
bzr revid: ged@openerp.com-20140410133408-ekglqz9jc4v9nvn7
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, 0 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 3125d9e938b..08ae6df5e0b 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2400,7 +2400,6 @@
}
.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 ca77310b0d9..7ebc7408127 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1953,7 +1953,6 @@ $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