From 66529a749f296f8e895cf07ddcb82abdb6628cae Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Tue, 2 Feb 2016 11:46:10 +0100
Subject: [PATCH] fix active style in menu dropdown

---
 Gemfile.lock                                             | 4 ++--
 app/assets/javascripts/app/views/navigation/menu.jst.eco | 2 +-
 app/assets/stylesheets/zammad.scss                       | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index da7a015a6..3044c2e01 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -156,6 +156,7 @@ GEM
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
+    mysql2 (0.3.20)
     naught (1.1.0)
     nenv (0.2.0)
     net-ldap (0.13.0)
@@ -195,7 +196,6 @@ GEM
       omniauth-oauth (~> 1.1)
     parser (2.3.0.2)
       ast (~> 2.2)
-    pg (0.18.4)
     pluginator (1.3.0)
     power_assert (0.2.7)
     powerpack (0.1.1)
@@ -347,13 +347,13 @@ DEPENDENCIES
   libv8
   mail
   mime-types
+  mysql2 (~> 0.3.20)
   net-ldap
   omniauth
   omniauth-facebook
   omniauth-google-oauth2
   omniauth-linkedin
   omniauth-twitter
-  pg
   pre-commit
   puma
   rack-livereload
diff --git a/app/assets/javascripts/app/views/navigation/menu.jst.eco b/app/assets/javascripts/app/views/navigation/menu.jst.eco
index 9d37c8563..624f3043a 100644
--- a/app/assets/javascripts/app/views/navigation/menu.jst.eco
+++ b/app/assets/javascripts/app/views/navigation/menu.jst.eco
@@ -16,7 +16,7 @@
         <% if item.navheader: %>
           <li class="dropdown-header"><%- @T( item.navheader ) %></li>
         <% end %>
-        <li class="<% if @active_tab[item.target] : %>active<% end %>"><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge badge--text count"><%= item['count'] %></span><% end %></a></li>
+        <li<%- ' class="is-active"' if @active_tab[item.target] %>><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge badge--text count"><%= item['count'] %></span><% end %></a></li>
       <% end %>
     </ul>
   </div>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 589f5b7c2..65a51fd04 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -5503,7 +5503,7 @@ footer {
     color: hsl(198,19%,72%);
   }
 
-  .dropdown-menu.dropdown-menu--light > li > a {
+  .dropdown-menu.dropdown-menu--light > li {
     color: hsl(202,70%,49%);
   }
 
@@ -5512,10 +5512,12 @@ footer {
     background: rgba(0,0,0,.05);
   }
 
-  .dropdown-menu.dropdown-menu--light li:hover,
-  .dropdown-menu.dropdown-menu--light li.is-active {
+  .dropdown-menu.dropdown-menu--light li:hover {
     background: none;
   }
+  .dropdown-menu.dropdown-menu--light li.is-active {
+    color: white;
+  }
 
   .dropdown ul {
     margin: 0;