diff options
| author | Martin Trigaux <mat@odoo.com> | 2019-07-16 15:45:24 +0000 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2019-07-16 15:45:24 +0000 |
| commit | 5d57e1862f3d178313534fc201216fdd31e5247d (patch) | |
| tree | 1d78d498b6805baa9979f3b0860b669c9346c765 /addons/web/static/src | |
| parent | 02c48e71f06ba335dcbde020d7fe28663e1afd00 (diff) | |
| parent | beba36416fdf25df74cf8a581c66948a418173b6 (diff) | |
[MERGE] Forward port of saas-12.4 to master up to beba36416fdf2
closes odoo/odoo#34924
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/list/list_renderer.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/scss/list_view.scss | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/addons/web/static/src/js/views/list/list_renderer.js b/addons/web/static/src/js/views/list/list_renderer.js index ad1a95cd14f..46b8d58d05e 100644 --- a/addons/web/static/src/js/views/list/list_renderer.js +++ b/addons/web/static/src/js/views/list/list_renderer.js @@ -25,6 +25,7 @@ var DECORATIONS = [ ]; var FIELD_CLASSES = { + char: 'o_list_char', float: 'o_list_number', integer: 'o_list_number', monetary: 'o_list_number', diff --git a/addons/web/static/src/scss/list_view.scss b/addons/web/static/src/scss/list_view.scss index d7a0384ed22..3d25258eac5 100644 --- a/addons/web/static/src/scss/list_view.scss +++ b/addons/web/static/src/scss/list_view.scss @@ -30,12 +30,10 @@ &.o_list_number { text-align: right; } - &.o_list_text { - white-space: pre-wrap; - } + &.o_list_char, + &.o_list_text, &.o_list_many2one { white-space: pre-wrap; - } } @@ -180,11 +178,14 @@ .o_list_record_remove_header, .o_handle_cell { width: 32px; } + &>tbody>tr>td.o_list_char, &>tbody>tr>td.o_list_many2one { white-space: nowrap; } // checkboxes in editable lists should be clickable and activate the row .o_data_row:not(.o_selected_row) .o_data_cell { + &.o_toggle_button_cell:not(.o_readonly_modifier) button, // registry: toggle_button + &.o_boolean_favorite_cell:not(.o_readonly_modifier) .o_favorite, // registry: boolean_favorite .custom-checkbox:not(.o_readonly_modifier) { pointer-events: none; } |