From 12892862e9770e27a9a9ca9a4f01808f0d7e4c73 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Wed, 7 Oct 2015 14:18:32 +0200
Subject: [PATCH] fix menu dropdown

---
 .../app/views/navigation/menu.jst.eco         | 35 ++++++++++---------
 app/assets/stylesheets/zammad.scss            | 17 ++++-----
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/app/views/navigation/menu.jst.eco b/app/assets/javascripts/app/views/navigation/menu.jst.eco
index 8f39ef7e9..f747830a3 100644
--- a/app/assets/javascripts/app/views/navigation/menu.jst.eco
+++ b/app/assets/javascripts/app/views/navigation/menu.jst.eco
@@ -1,6 +1,7 @@
 <% for item in @items: %>
   <% if item.child: %>
-    <a href="<%= item.target %>" class="dropdown-toggle dropdown<%- ' open' if @open_tab[item.target] %>" data-toggle="dropdown">
+  <div class="dropdown<%- ' open' if @open_tab[item.target] %>">
+    <a href="<%= item.target %>" class="menu-item js-<%- item.class %>MenuItem dropdown-toggle" data-toggle="dropdown">
         <%- @Icon(item.class, 'menu-item-icon') %>
         <span class="menu-item-name flex">
           <%- @T(item.name) %>
@@ -18,22 +19,22 @@
         <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>
       <% end %>
     </ul>
-  </li>
+  </div>
   <% else: %>
-    <a class="menu-item js-<%- item.class %>MenuItem<%- ' is-active' if @active_tab[item.target] %>" href="<%= item.target %>">
-      <%- @Icon(item.class, 'menu-item-icon') %>
-      <span class="menu-item-name">
-        <%- @T(item.name) %>
-      </span>
-      <% if item.counter: %>
-      <span class="counter badge badge--big"></span>
-      <% end %>
-      <% if item.switch: %>
-      <span class="zammad-switch zammad-switch--dark zammad-switch--small">
-         <input type="checkbox" id="<%- item.class %>-switch">
-         <label for="<%- item.class %>-switch"></label>
-      </span>
-      <% end %>
-    </a>
+  <a class="menu-item js-<%- item.class %>MenuItem<%- ' is-active' if @active_tab[item.target] %>" href="<%= item.target %>">
+    <%- @Icon(item.class, 'menu-item-icon') %>
+    <span class="menu-item-name">
+      <%- @T(item.name) %>
+    </span>
+    <% if item.counter: %>
+    <span class="counter badge badge--big"></span>
+    <% end %>
+    <% if item.switch: %>
+    <span class="zammad-switch zammad-switch--dark zammad-switch--small">
+       <input type="checkbox" id="<%- item.class %>-switch">
+       <label for="<%- item.class %>-switch"></label>
+    </span>
+    <% end %>
+  </a>
   <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 2f65be11d..3f39324b0 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -2289,6 +2289,12 @@ footer {
     height: 22px;
   }
 
+  .menu .dropdown-menu {
+    left: 10px;
+    right: 15px;
+    min-width: 0;
+  }
+
   .menu-item {
     padding: 0 15px;
     height: 48px;
@@ -2297,12 +2303,13 @@ footer {
     text-decoration: none;
     display: flex;
     align-items: center;
+    cursor: pointer;
 
     &:hover {
       background: hsl(230,10%,13%);
       border-bottom-color: rgba(240, 250, 255, .08);
     }
-    
+
     &.is-active,
     &.is-hovered {
       background: none;
@@ -2325,13 +2332,7 @@ footer {
     }
 
     .dropdown-icon {
-      fill: hsl(206,7%,37%);
-    }
-
-    .dropdown-menu {
-      left: 10px;
-      right: 15px;
-      min-width: 0;
+      fill: currentColor;
     }
   }