From 63e384eaee043e2735778032bf911bbd3196a55e Mon Sep 17 00:00:00 2001
From: "stefanorigano (SRI)" <sri@odoo.com>
Date: Tue, 22 Mar 2022 13:41:50 +0000
Subject: [PATCH] [IMP] web: remove `dropdown_extra.scss`

This commit improves consistency between jQueryUI dropdowns and the
overall UI. It also address inconsistencies between versions allowing
to remove 'dropdown_extra.scss' [1].
Part of the overall v16 SCSS optimization/restyle, task-2704984.

[1] enterprise adaptations: https://github.com/odoo/enterprise/pull/25700

task-2800721

Part-of: odoo/odoo#87448
---
 addons/web/__manifest__.py                           |  1 -
 addons/web/static/src/legacy/scss/dropdown.scss      | 12 ++++++++++++
 .../web/static/src/legacy/scss/dropdown_extra.scss   | 12 ------------
 3 files changed, 12 insertions(+), 13 deletions(-)
 delete mode 100644 addons/web/static/src/legacy/scss/dropdown_extra.scss

diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py
index 10ce91c186f..009622c79e0 100644
--- a/addons/web/__manifest__.py
+++ b/addons/web/__manifest__.py
@@ -134,7 +134,6 @@ This module provides the core of the Odoo Web Client.
             'web/static/src/legacy/scss/ribbon.scss',
             'web/static/src/legacy/scss/base_settings.scss',
             'web/static/src/legacy/scss/report_backend.scss',
-            'web/static/src/legacy/scss/dropdown_extra.scss',
             'web/static/src/legacy/scss/fields_extra.scss',
             'web/static/src/legacy/scss/form_view_extra.scss',
             'web/static/src/legacy/scss/list_view_extra.scss',
diff --git a/addons/web/static/src/legacy/scss/dropdown.scss b/addons/web/static/src/legacy/scss/dropdown.scss
index a3a9b32e0e8..574fe3fd14b 100644
--- a/addons/web/static/src/legacy/scss/dropdown.scss
+++ b/addons/web/static/src/legacy/scss/dropdown.scss
@@ -26,6 +26,14 @@
             text-indent: $o-dropdown-hpadding * .5;
         }
 
+        &.o_m2o_dropdown_option > a {
+            color: $link-color;
+
+            &.ui-state-active {
+                color: $link-hover-color;
+            }
+        }
+
         &.o_m2o_start_typing, &.o_m2o_no_result {
             font-style: italic;
             cursor: default;
@@ -33,6 +41,10 @@
                 background: none;
             }
         }
+
+        &.o_m2o_start_typing > a.ui-state-active {
+            color: $dropdown-link-color;
+        }
     }
 }
 
diff --git a/addons/web/static/src/legacy/scss/dropdown_extra.scss b/addons/web/static/src/legacy/scss/dropdown_extra.scss
deleted file mode 100644
index ad1df061a2f..00000000000
--- a/addons/web/static/src/legacy/scss/dropdown_extra.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-.ui-autocomplete .ui-menu-item {
-    &.o_m2o_dropdown_option > a {
-        color: $o-brand-odoo;
-
-        &.ui-state-active {
-            color: darken($o-brand-odoo, 10%);
-        }
-    }
-    &.o_m2o_start_typing > a.ui-state-active {
-        color: $dropdown-link-color;
-    }
-}