diff --git a/addons/crm/data/crm_lead_merge_template.xml b/addons/crm/data/crm_lead_merge_template.xml index 18eb7143bc0..9f18aea16d0 100644 --- a/addons/crm/data/crm_lead_merge_template.xml +++ b/addons/crm/data/crm_lead_merge_template.xml @@ -68,7 +68,7 @@ Tags:
+ t-attf-class="badge rounded-pill o_tag o_tag_color_#{tag.color} d-inline-block"/>
@@ -168,7 +168,7 @@
+ t-attf-class="badge rounded-pill o_tag o_tag_color_#{tag.get('color', 0)} d-inline-block me-2"/>
diff --git a/addons/event/views/event_registration_views.xml b/addons/event/views/event_registration_views.xml index d2d793befdf..d2f9f8556a3 100644 --- a/addons/event/views/event_registration_views.xml +++ b/addons/event/views/event_registration_views.xml @@ -152,9 +152,9 @@ Booked by -
+
-
+
diff --git a/addons/project/static/src/scss/project_widgets.scss b/addons/project/static/src/scss/project_widgets.scss index 01fe49f302a..9fc5b841627 100644 --- a/addons/project/static/src/scss/project_widgets.scss +++ b/addons/project/static/src/scss/project_widgets.scss @@ -37,10 +37,6 @@ cursor: pointer; } -.o_kanban_project_tasks .o_kanban_renderer .o_field_many2manytags{ - margin: 0px; -} - .o_project_m2m_avatar { width: 20px; height: 20px; diff --git a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.scss b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.scss index af510297731..244f0a07dd3 100644 --- a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.scss +++ b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.scss @@ -72,7 +72,6 @@ width: 100%; } - .o_field_many2manytags, .date_filter_values { display: flex; gap: map-get($spacers, 2); diff --git a/addons/web/static/src/legacy/scss/fields.scss b/addons/web/static/src/legacy/scss/fields.scss index 1d3582e251d..eb72cdcfa72 100644 --- a/addons/web/static/src/legacy/scss/fields.scss +++ b/addons/web/static/src/legacy/scss/fields.scss @@ -98,7 +98,7 @@ } // Flex fields (inline) - &.o_field_many2one, &.o_field_radio, &.o_field_many2manytags, &.o_field_percent_pie, &.o_field_monetary, &.o_field_binary_file, &.o_field_float_percentage { + &.o_field_many2one, &.o_field_radio, &.o_field_percent_pie, &.o_field_monetary, &.o_field_binary_file, &.o_field_float_percentage { display: inline-flex; > span, > button { flex: 0 0 auto; @@ -153,151 +153,6 @@ padding-bottom: 0; } - // Many2many tags - &.o_field_many2manytags { - flex-flow: row wrap; - align-items: stretch; - max-width: 100%; - - > .o_field_widget { - flex: 1 0 100px; - position: initial; - max-width: 100%; - } - - .o_field_many2one_selection, .o_input { - height: 100%; - } - - .badge { - flex: 0 0 auto; - margin: 1px 2px 1px 0; - border: 0; - font-size: 12px; - user-select: none; - display: flex; - max-width: 100%; - - &.dropdown { - cursor: pointer; - } - - a { - color: inherit; - } - - .o_badge_text { - @include o-text-overflow(inline-block); - max-width: 200px; - color: inherit; - line-height: 1.1; - } - - .o_delete { - color: inherit; - cursor: pointer; - padding-left: 4px; - } - } - - // o-kanban-colorpicker without customizing - // '&:first-child > a::before' (transparent red-crossed colorpick) - @mixin o-tag-colorpicker { - $o-tag-colorpicker-padding-right: $o-dropdown-hpadding - 2 * 5px; // FIXME was $o-kanban-inner-hmargin before scss convertion - - max-width: 100%; - padding: 3px $o-tag-colorpicker-padding-right 3px $o-dropdown-hpadding; - - > li { - display: inline-block; - margin: 5px 5px 0 0; // FIXME was $o-kanban-inner-hmargin before scss convertion - border: 1px solid white; - box-shadow: 0 0 0 1px map-get($grays, '300'); - - > a { - display: block; - - &::after { - content: ""; - display: block; - width: 20px; - height: 15px; - } - } - - &:last-of-type { - box-shadow: 0 0 0 0px white; // remove grey border on hide in kanban - color: $o-main-text-color; - } - } - } - - .tagcolor_dropdown_menu { - min-width: 150px; // down from 160px of .dropdown-menu - margin-right: 0px; // cancel right margin of .dropdown-menu - } - - .o_colorpicker > ul { - @include o-tag-colorpicker; - white-space: normal; - li > .o_hide_in_kanban label { - line-height: $o-line-height-base; - } - } - - .o_tag_error { - box-shadow: inset 0 0 0 2px #FF0000; - - .o_delete { - color: #FF0000; - } - } - // Many2many tags avatar - &.avatar { - .badge { - align-items: center; - padding: 0; - padding-right: 0.6rem; - - img { - height: 1.4em; - width: 1.4em; - object-fit: cover; - } - - .o_badge_text, .o_delete { - padding-top: 0.25em; - padding-bottom: 0.25em; - } - - .o_tag_badge_text { - padding-left:2px; - } - } - } - &.o_field_many2manytags_multi { - margin-bottom: 0px; - > span { - display: inline-block; - } - .o_m2m_avatar, .o_m2m_avatar_empty { - width: 20px; - height: 20px; - margin-left: 0px; - } - .o_m2m_avatar_empty { - background-color: #dee2e6; - vertical-align: bottom; - } - &.avatar.o_clickable_m2x_avatar { - img.o_m2m_avatar { - margin-right: 0px; - object-fit: cover; - } - } - } - } - // Stars &.o_priority, & .o_priority { display: inline-block; diff --git a/addons/web/static/src/legacy/scss/fields_extra.scss b/addons/web/static/src/legacy/scss/fields_extra.scss index 8ba4e2d1fac..156e27a9344 100644 --- a/addons/web/static/src/legacy/scss/fields_extra.scss +++ b/addons/web/static/src/legacy/scss/fields_extra.scss @@ -8,17 +8,6 @@ //------------------------------------------------------------------------------ .o_field_widget { - &.o_field_many2manytags { - .o_dropdown_button { - top: 0; - right: 0; - } - - &.avatar .o_dropdown_button { - top: $o-input-padding-y; - } - } - // Many2one &.o_field_many2one .o_external_button { flex: 0 0 auto; diff --git a/addons/web/static/src/views/form/setting/setting.scss b/addons/web/static/src/views/form/setting/setting.scss index ed6b8a2c9b6..95a1a904313 100644 --- a/addons/web/static/src/views/form/setting/setting.scss +++ b/addons/web/static/src/views/form/setting/setting.scss @@ -30,10 +30,6 @@ width: 50%; } } - - &.o_field_many2manytags > .o_field_widget { - flex: 1 0 50px; - } } button.btn-link:first-child { diff --git a/addons/web/static/src/views/kanban/kanban_controller.scss b/addons/web/static/src/views/kanban/kanban_controller.scss index f99eef7ae4e..593b40e0139 100644 --- a/addons/web/static/src/views/kanban/kanban_controller.scss +++ b/addons/web/static/src/views/kanban/kanban_controller.scss @@ -341,13 +341,6 @@ .o_tag { --Tag-max-width: MAX(200px, 100%); --Tag-font-size: #{$o-font-size-base-smaller}; - @for $size from 1 through length($o-colors) { - // Note: the first color is supposed to be invisible if there is a color - // field but it is used as a default color when there is no color field - &.o_tag_color_#{$size - 1} span { - background-color: nth($o-colors, $size); - } - } } } diff --git a/addons/web/static/src/views/list/list_renderer.scss b/addons/web/static/src/views/list/list_renderer.scss index d670d69c9bb..db3ab414849 100644 --- a/addons/web/static/src/views/list/list_renderer.scss +++ b/addons/web/static/src/views/list/list_renderer.scss @@ -292,13 +292,6 @@ pointer-events: auto; } } - &.o_many2many_avatar_user_cell { - .o_field_many2manytags { - > span { - margin-right: 2px; - } - } - } } .o_data_row:not(.o_selected_row) { @@ -342,10 +335,6 @@ width: 0; // override width: 100px and let flex makes this input grow margin: 0 4px; } - &.o_field_many2manytags > .o_field_many2one { - // reduce basis to prevent many2one input from going to the next line to often - flex-basis: 40px; - } .o_field_many2one_avatar { display: flex; } diff --git a/addons/web_tour/static/src/tour_service/tour_utils.js b/addons/web_tour/static/src/tour_service/tour_utils.js index a2d66b76d6a..2253b09c6f6 100644 --- a/addons/web_tour/static/src/tour_service/tour_utils.js +++ b/addons/web_tour/static/src/tour_service/tour_utils.js @@ -83,7 +83,7 @@ export function getConsumeEventType(element, runCommand) { const tag = tagName.toLowerCase(); // Many2one - if (classList.contains("o_field_many2one") || classList.contains("o_field_many2manytags")) { + if (classList.contains("o_field_many2one")) { return "autocompleteselect"; }