diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-04-08 11:08:52 +0200 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-04-08 11:08:52 +0200 |
| commit | 53cca3a04652419fea1c7377acfe62eae1af8a88 (patch) | |
| tree | 680a9ba3d9ce7c27916cdfd7548b1b4c43ae9dd1 /addons/web/static/src/css | |
| parent | 4d797222279e361bfe6db0fe45f3ff503b87c717 (diff) | |
| parent | f1d3f2a0c42f1de5970b5f897c4e5b279d1ee23b (diff) | |
[MERGE] merge from trunk
bzr revid: ged@openerp.com-20140407080642-b51z9j9cryb72tpc
bzr revid: ged@openerp.com-20140408090852-xmfi9nwd2lzsfbza
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 5 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 66bfaca7c6e..3125d9e938b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1284,12 +1284,14 @@ width: 100%; } .openerp .oe_view_manager .oe_view_manager_body { - display: table-row; height: inherit; } .openerp .oe_view_manager .oe_view_manager_view_kanban:not(:empty) { height: inherit; } +.openerp .oe_view_manager[data-view-type=kanban] .oe_view_manager_body { + display: table-row; +} .openerp .oe_view_manager table.oe_view_manager_header { border-collapse: separate; width: 100%; @@ -2398,6 +2400,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 7110349557a..ca77310b0d9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1068,10 +1068,12 @@ $sheet-padding: 16px height: inherit width: 100% .oe_view_manager_body - display: table-row height: inherit .oe_view_manager_view_kanban:not(:empty) height: inherit + &[data-view-type=kanban] + .oe_view_manager_body + display: table-row table.oe_view_manager_header border-collapse: separate @@ -1951,6 +1953,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 |