diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-04-07 15:11:50 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-04-07 15:11:50 +0200 |
| commit | d4d5181285196f6c3e311a6afdd356f4dc2851ef (patch) | |
| tree | f83e7d8cea5546de5929d24bf3a05008aaea29d1 /addons/web/static/src | |
| parent | 606712a5d2881de91525275d78e574660301461a (diff) | |
| parent | 271067f50c206ae44fc11c57d8a7c4d5c3340d65 (diff) | |
[MERGE] forward port branch saas-6 up to 271067f50c2
Diffstat (limited to 'addons/web/static/src')
| -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 31c4eebda9d..44093469135 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1423,6 +1423,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; @@ -2203,6 +2204,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 37ac418816d..0073a1195c5 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1279,6 +1279,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 @@ -1892,6 +1893,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 |