From 90d22851b261f6e3cea48ff933a6a7b4233428db Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Wed, 1 Aug 2018 14:02:36 +0200
Subject: [PATCH] [FIX] web: BS4, review selected dropdown item style (II)

Completes commit https://github.com/odoo/odoo/commit/e10a4303c21332f10d89b0c19661cc11ca0dc7a6
---
 addons/web/static/src/scss/dropdown_menu.scss | 22 ++++++++++++++++-
 addons/web/static/src/scss/graph_view.scss    |  7 ------
 addons/web/static/src/scss/pivot_view.scss    |  7 ------
 addons/web/static/src/scss/search_view.scss   |  3 ---
 addons/web/static/src/scss/utils.scss         | 24 -------------------
 5 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/addons/web/static/src/scss/dropdown_menu.scss b/addons/web/static/src/scss/dropdown_menu.scss
index c1c83cd58a6..8f11ba7c0a1 100644
--- a/addons/web/static/src/scss/dropdown_menu.scss
+++ b/addons/web/static/src/scss/dropdown_menu.scss
@@ -1,5 +1,4 @@
 .o_dropdown_menu {
-
     > .dropdown-divider:first-child {
         display: none;
     }
@@ -22,3 +21,24 @@
         }
     }
 }
+
+.dropdown-item {
+    position: relative;
+    color: $o-main-text-color;
+
+    &:hover {
+        color: darken($o-main-text-color, 10%);
+    }
+
+    &.selected { // TODO why not using standard BS4 "active" class ?
+        color: darken($o-main-text-color, 10%);
+        font-weight: bold;
+
+        &:before {
+            font-family: FontAwesome;
+            position: absolute;
+            left: 4px;
+            content: "\f00c";
+        }
+    }
+}
\ No newline at end of file
diff --git a/addons/web/static/src/scss/graph_view.scss b/addons/web/static/src/scss/graph_view.scss
index adbf8e88dd1..b30e066b278 100644
--- a/addons/web/static/src/scss/graph_view.scss
+++ b/addons/web/static/src/scss/graph_view.scss
@@ -11,10 +11,3 @@
 .nvtooltip thead {
     background-color: transparent;
 }
-
-// ------------------------------------------------------------------
-// Control panel buttons
-// ------------------------------------------------------------------
-.o_graph_measures_list, .o_graph_groupbys_list {
-    @include o-selected-li;
-}
diff --git a/addons/web/static/src/scss/pivot_view.scss b/addons/web/static/src/scss/pivot_view.scss
index d10c4997f43..ae0e97fa3dd 100644
--- a/addons/web/static/src/scss/pivot_view.scss
+++ b/addons/web/static/src/scss/pivot_view.scss
@@ -69,10 +69,3 @@
         top: 9px;
     }
 }
-
-// ------------------------------------------------------------------
-// Control panel buttons
-// ------------------------------------------------------------------
-.o_pivot_measures_list {
-    @include o-selected-li;
-}
\ No newline at end of file
diff --git a/addons/web/static/src/scss/search_view.scss b/addons/web/static/src/scss/search_view.scss
index dc728c49d27..15071a156b8 100644
--- a/addons/web/static/src/scss/search_view.scss
+++ b/addons/web/static/src/scss/search_view.scss
@@ -143,8 +143,6 @@
 
 // Filters
 .o_filters_menu {
-    @include o-selected-li;
-
     max-height: calc(100vh - 125px);
     overflow: auto;
 
@@ -189,7 +187,6 @@
 .o_favorites_menu {
     max-height: 75vh;
     overflow-y: auto;
-    @include o-selected-li;
 
     max-height: calc(100vh - 125px);
     overflow: auto;
diff --git a/addons/web/static/src/scss/utils.scss b/addons/web/static/src/scss/utils.scss
index ccc0b1e24d8..476512f73bd 100644
--- a/addons/web/static/src/scss/utils.scss
+++ b/addons/web/static/src/scss/utils.scss
@@ -105,30 +105,6 @@
     -moz-transform: scale(0.9999); // Smooth the caret on firefox
 }
 
-// ------------------------------------------------------------------
-// Dropdowns
-// ------------------------------------------------------------------
-@mixin o-selected-li { // FIXME use active ?
-    .dropdown-item {
-        position: relative;
-        color: $o-main-text-color;
-        &:hover {
-            color: darken($o-main-text-color, 10%);
-        }
-
-        &.selected {
-            color: darken($o-main-text-color, 10%);
-            font-weight: bold;
-            &:before {
-                font-family: FontAwesome;
-                position: absolute;
-                left: 4px;
-                content: "\f00c";
-            }
-        }
-    }
-}
-
 // ------------------------------------------------------------------
 // Hovering effects
 // ------------------------------------------------------------------