Merge branch 'develop' of github.com:martini/zammad into develop

app/assets/javascripts/app/controllers/layout_ref.coffee

@@ -1779,7 +1779,6 @@ class App.CustomerChatRef extends App.Controller
 
   propagateLayoutChange: (event) =>
     # adjust scroll position on layoutChange
-    console.log "propagateLayoutChange", event
 
     for chat in @chatWindows
       chat.trigger 'layout-changed'
@@ -1904,7 +1903,7 @@ class chatWindowRef extends Spine.Controller
     @lastTimestamp
     @lastAddedType
     @render()
-    @sound.window.play()
+    #@sound.window.play()
 
     @on 'layout-change', @scrollToBottom
 

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,7 +19,7 @@
         <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') %>

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,6 +2303,7 @@ footer {
     text-decoration: none;
     display: flex;
     align-items: center;
+    cursor: pointer;
 
     &:hover {
       background: hsl(230,10%,13%);
@@ -2325,13 +2332,7 @@ footer {
     }
 
     .dropdown-icon {
-      fill: hsl(206,7%,37%);
-    }
-
-    .dropdown-menu {
-      left: 10px;
-      right: 15px;
-      min-width: 0;
+      fill: currentColor;
     }
   }