diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-09-09 18:02:30 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-09-09 18:02:30 +0200 |
| commit | e447a46ec8586125e21bc30898f3be34d5a69817 (patch) | |
| tree | 997e09ae9de698fe49c01f0394ec48e9b62ba5b8 /addons/web/static/src/css | |
| parent | 3d80dc2bbfcda08e787159d2711ac0dc56f81ad6 (diff) | |
| parent | 33e0910841e0a7e63054e28c50e881af1f16c771 (diff) | |
[MERGE] forward port of branch 7.0 up to 33e0910
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 | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d221dfba409..6f841fde15a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2755,7 +2755,9 @@ .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; - max-width: 100px; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer span { + padding: 0px 6px; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input { width: 100% !important; @@ -3175,7 +3177,6 @@ top: 0px; } } - .kitten-mode-activated { background-size: cover; background-attachment: fixed; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 05270c0b68f..e0a5efd4fd0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2213,7 +2213,8 @@ $sheet-padding: 16px &.oe_readonly padding: 6px 0px 0px text-align: right - max-width: 100px + span + padding: 0px 6px input width: 100% !important text-align: right |