From 698e6e84f8fd31bbab997c8fed5bfa02358c7952 Mon Sep 17 00:00:00 2001
From: Henriette Dinger <h.dinger@openproject.com>
Date: Tue, 26 Mar 2019 13:47:47 +0100
Subject: [PATCH] Remove unused variable && correct hover effects of main menus
 with toggled

---
 app/assets/stylesheets/layout/_main_menu.sass | 47 +++++++++----------
 lib/open_project/design.rb                    |  1 -
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/app/assets/stylesheets/layout/_main_menu.sass b/app/assets/stylesheets/layout/_main_menu.sass
index a89a3c3d6f..3d4b781635 100644
--- a/app/assets/stylesheets/layout/_main_menu.sass
+++ b/app/assets/stylesheets/layout/_main_menu.sass
@@ -29,6 +29,14 @@
 $toggler-width: 40px
 $menu-item-line-height: 30px
 
+@mixin main-menu-hover
+  @include varprop(background, main-menu-bg-hover-background)
+  @include varprop(color, main-menu-hover-font-color)
+
+@mixin main-menu-selected
+  @include varprop(background, main-menu-bg-selected-background)
+  @include varprop(color, main-menu-selected-font-color)
+
 .main-menu
   @include varprop(width, main-menu-width)
   @include varprop(min-width, main-menu-width)
@@ -126,26 +134,22 @@ $arrow-left-width: 40px
 .main-item-wrapper
   display: flex
 
-  &:hover
-    @if $main-menu-enable-toggle-highlighting != true
-      // simultaneously hover all menu item anchor tags
-      > a
-        @include varprop(color, main-menu-hover-font-color)
-        &.toggler
-          @include varprop(background, main-menu-bg-hover-background)
 
+  .toggler:hover
+    @include main-menu-hover
 
   a
     &.selected, &.selected + a
-      @include varprop(background, main-menu-bg-selected-background)
-      @include varprop(color, main-menu-selected-font-color)
+      @include main-menu-selected
 
       &:hover
-        @include varprop(background, main-menu-bg-hover-background)
+        @include main-menu-hover
 
     &:hover, &:focus , &:active
-      @include varprop(background, main-menu-bg-hover-background)
-      @include varprop(color, main-menu-hover-font-color)
+      @include main-menu-hover
+
+      &~ .toggler
+        @include main-menu-hover
 
   a:not(.toggler)
     @extend .small-12
@@ -177,18 +181,15 @@ $arrow-left-width: 40px
           padding: initial
 
     &:hover
-      @if $main-menu-enable-toggle-highlighting != true
-        // simultaneously hover all menu item anchor tags
-        > a
-          @include varprop(color, main-menu-bg-hover-background)
+      // simultaneously hover all menu item anchor tags
+      > a
+        @include varprop(color, main-menu-bg-hover-background)
 
     > a
       &.selected, &.selected
-        @include varprop(background, main-menu-bg-selected-background)
-        @include varprop(color, main-menu-selected-font-color)
+        @include main-menu-selected
       &:hover, &:focus , &:active
-        @include varprop(color, main-menu-hover-font-color)
-        @include varprop(background, main-menu-bg-hover-background)
+        @include main-menu-hover
 
 .main-menu--children-menu-header
   padding: 10px 10px 0 10px
@@ -203,8 +204,7 @@ $arrow-left-width: 40px
   padding-right: 14px
   width: 40px
   &:hover, &:focus, &:active
-    @include varprop(background, main-menu-bg-hover-background)
-    @include varprop(color, main-menu-hover-font-color)
+    @include main-menu-hover
 
 a.main-menu--parent-node
   display: inline-block
@@ -217,8 +217,7 @@ a.main-menu--parent-node
   border-radius: 3px
   @include varprop(color, main-menu-font-color)
   &:hover, &:focus, &:active
-    @include varprop(background, main-menu-bg-hover-background)
-    @include varprop(color, main-menu-hover-font-color)
+    @include main-menu-hover
 
 // logic for showing either parent or child menu
 .main-menu
diff --git a/lib/open_project/design.rb b/lib/open_project/design.rb
index f606ec76f7..729313d938 100644
--- a/lib/open_project/design.rb
+++ b/lib/open_project/design.rb
@@ -86,7 +86,6 @@ module OpenProject
       'main-menu-item-height'                                => "40px",
       'main-menu-item-border-color'                          => "$primary-color",
       'main-menu-item-border-width'                          => "1px",
-      'main-menu-enable-toggle-highlighting'                 => "false",
       'main-menu-bg-color'                                   => "#333739",
       'main-menu-bg-selected-background'                     => "#175A8E",
       'main-menu-bg-hover-background'                        => "#124E7C",