diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-04-06 14:46:56 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-04-06 14:46:56 +0200 |
| commit | 271067f50c206ae44fc11c57d8a7c4d5c3340d65 (patch) | |
| tree | 6ce680858db64bfc989c67edc8322be50cf91f5c /addons/web/static/src/css | |
| parent | 7bcfa2b52a347861629eb22af832726c6139c5a3 (diff) | |
| parent | 3128e8424373c545ea821c6d7e067f431f5b54d3 (diff) | |
[MERGE] forward port branch 8.0 up to 3128e842437
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 | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e1e5d087ab3..a72cf529106 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1672,6 +1672,7 @@ .openerp .oe_application .oe_form_sheetbg { background: url(/web/static/src/img/form_sheetbg.png); border-bottom: 1px solid #ddd; + z-index: 1; } .openerp .oe_application .oe_form_sheetbg .oe_subtotal_footer label { font-weight: bold; @@ -2433,6 +2434,10 @@ .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field select { min-width: 0; } +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea.field_text { + position: relative; + z-index: 1; +} .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float.oe_readonly, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer.oe_readonly { padding: 6px 0px 0px; text-align: right; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1fe887a4a8d..0391b597f27 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1402,6 +1402,7 @@ $sheet-padding: 16px .oe_form_sheetbg background: url(/web/static/src/img/form_sheetbg.png) border-bottom: 1px solid #ddd + z-index: 1 // Customize font weight according bootstrap3 .oe_subtotal_footer label font-weight: bold @@ -1999,6 +2000,9 @@ $sheet-padding: 16px margin: 0 input, textarea, select min-width: 0 + textarea.field_text + position: relative + z-index: 1 &.oe_form_field_float,&.oe_form_view_integer &.oe_readonly padding: 6px 0px 0px |