diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-06-22 15:36:10 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-06-22 15:36:10 +0200 |
| commit | e862ff7033dd001a84d7e0a192d0da7b11384bd9 (patch) | |
| tree | 349a80be398aeb306d443239c88e522f66d43e39 /addons/web/static/src/css/base.sass | |
| parent | 0e595c418612d8236d63ec70c2f8dccb7cff3407 (diff) | |
| parent | 4cb5381deecdf28d2a0f6b1e7f4b16a611ec9de9 (diff) | |
[MERGE] forward port of branch saas-5 up to 4cb5381
Conflicts:
openerp/addons/base/module/wizard/base_module_upgrade_view.xml
Diffstat (limited to 'addons/web/static/src/css/base.sass')
| -rw-r--r-- | addons/web/static/src/css/base.sass | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index dce3401a3ed..07d683268f1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2138,7 +2138,7 @@ $sheet-padding: 16px .oe_list_editable .oe_list_content td.oe_list_field_cell padding: 4px 6px 3px .oe_list.oe_list_editable.oe_editing - .oe_edition .oe_list_field_cell:not(.oe_readonly) + .oe_edition .oe_list_field_cell * visibility: hidden color: transparent @@ -2150,6 +2150,11 @@ $sheet-padding: 16px .oe_input_icon margin-top: 5px .oe_form_field + &.oe_list_field_handle + color: transparent + &.oe_readonly + padding: 4px 6px 3px + text-align: left min-width: 0 max-width: none input, textarea @@ -2160,9 +2165,13 @@ $sheet-padding: 16px input, textarea, select min-width: 0 &.oe_form_field_float,&.oe_form_view_integer - input + &.oe_readonly + padding: 6px 0px 0px text-align: right + max-width: 100px + input width: 100% !important + text-align: right &.oe_form_field_datetime,&.oe_form_field_date input.oe_datepicker_master width: 100% !important |