fix tools dropdown, add tools icon, fix overview icon, add tools icon author

app/assets/javascripts/app/controllers/_default_navbar.js.coffee

@@ -16,5 +16,5 @@ App.Config.set( 'Admin', { prio: 9000, parent: '', name: 'Admin', translate: tru
 App.Config.set( 'New', { prio: 20000, parent: '', name: 'New', translate: true, target: '#new', class: 'add' }, 'NavBarRight' )
 
 App.Config.set( 'Misc', { prio: 90000, parent: '', name: 'Tools', translate: true, target: '#tools', child: true, class: 'tools' }, 'NavBar' )
-#App.Config.set( 'Misc1', { prio: 1600, parent: '#tools', name: 'Test 1', target: '#test1', role: [ 'Admin' ] }, 'NavBar' )
-#App.Config.set( 'Misc2', { prio: 1700, parent: '#tools', name: 'Test 2', target: '#test2', role: [ 'Admin' ] }, 'NavBar' )
+App.Config.set( 'Misc1', { prio: 1600, parent: '#tools', name: 'Test 1', target: '#test1', role: [ 'Admin' ] }, 'NavBar' )
+App.Config.set( 'Misc2', { prio: 1700, parent: '#tools', name: 'Test 2', target: '#test2', role: [ 'Admin' ] }, 'NavBar' )

app/assets/javascripts/app/views/navigation/menu.jst.eco

@@ -6,9 +6,9 @@
         <span class="nav-item-name flex">
           <%- @T( item.name ) %>
         </span>
-        <b class="caret"></b>
+        <svg class="dropdown-icon icon-arrow-down"><use xlink:href="#icon-arrow-down" /></svg>
     </a>
-    <ul class="dropdown-menu">
+    <ul class="dropdown-menu dropdown-menu--light">
       <% for item in item.child: %>
         <% if item.divider: %>
           <li class="divider"></li>

app/assets/javascripts/app/views/navigation/personal.jst.eco

@@ -9,7 +9,7 @@
           <svg class="user-menu-icon icon-plus"><use xlink:href="#icon-plus" /></svg>
         <% end %>
       </a>
-      <ul class="dropdown-menu" role="menu">
+      <ul class="dropdown-menu dropdown-menu--light" role="menu">
         <% for item, id in item.child: %>
           <% if item.divider and id > 0: %>
             <li class="divider"></li>

app/assets/stylesheets/zammad.css.scss

@@ -1532,7 +1532,7 @@ footer {
   flex-shrink: 0;
 }
 
-  .main-navigation a {
+  .main-navigation > li > a {
     padding: 0 15px;
     height: 48px;
     color: rgba(240, 250, 255, .25);
@@ -1550,7 +1550,8 @@ footer {
     color: white;
   }
 
-  .main-navigation > li.active .nav-icon {
+  .main-navigation > li.active .nav-icon,
+  .main-navigation > li.active .dropdown-icon {
     fill: currentColor;
   }
 
@@ -1558,7 +1559,13 @@ footer {
     background: #389ed9;
   }
 
-  .nav-icon {
+  .main-navigation .dropdown-menu {
+    left: 10px;
+    right: 15px;
+    min-width: 0;
+  }
+
+  .main-navigation .nav-icon {
     margin-right: 15px;
     vertical-align: bottom;
     width: 24px;
@@ -1566,6 +1573,10 @@ footer {
     fill: hsl(206,7%,37%);
   }
 
+  .main-navigation .dropdown-icon {
+    fill: hsl(206,7%,37%);
+  }
+
 .tasks {
   background: #2c2d36;
   overflow: auto;
@@ -1960,17 +1971,12 @@ footer {
     left: 10px;
     right: 15px;
     width: auto;
-    background: white;
   }
 
     .user-menu li.add .dropdown-menu {
       background-color: #38af6e;
     }
 
-    .user-menu li.add .dropdown-menu > li > a {
-      color: white;
-    }
-
     .user-menu li.add .dropdown-menu .divider {
       background: #4cb77c;
     }
@@ -1980,16 +1986,9 @@ footer {
   }
 
   .user-menu .dropdown-menu > li > a {
-    height: 40px;
-    color: #2594d4;
     display: flex;
   }
 
-  .user-menu .dropdown-menu > li > a:hover {
-    color: #2594d4;
-    background: rgba(0,0,0,.05);
-  }
-
 .avatar {
   width: 40px;
   height: 40px;
@@ -4013,6 +4012,24 @@ footer {
     opacity: 0.39;
   }
 
+  .dropdown-menu.dropdown-menu--light {
+    background: white;
+  }
+
+  .dropdown-menu.dropdown-menu--light > li > a {
+    color: hsl(202,70%,49%);
+  }
+
+  .dropdown-menu.dropdown-menu--light > li > a:hover {
+    color: #2594d4;
+    background: rgba(0,0,0,.05);
+  }
+
+  .dropdown-menu.dropdown-menu--light li:hover,
+  .dropdown-menu.dropdown-menu--light li.is-active {
+    background: none;
+  }
+
   .dropdown ul {
     margin: 0;
   }
@@ -4042,6 +4059,7 @@ footer {
     color: white;
     padding: 0 15px;
     margin: 0 -15px;
+    line-height: inherit;
   }
 
   .dropdown-menu > li > a:hover {

extras/icon_authors/index.php

@@ -1,3 +1,12 @@
+<?
+
+// check for ajax request
+if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
+  file_put_contents('list.json', json_encode($_POST['list'], JSON_PRETTY_PRINT));
+  exit();
+}
+
+?>
 <!doctype html>
 <title>Zammad Icons</title>
 <style>
@@ -136,15 +145,17 @@ if ($sortByImageName) {
 
 <script src="../../app/assets/javascripts/app/lib/core/jquery-2.1.1.min.js"></script>
 <script>
-  $('input').on('blur', function(){
+  $('input').on('input', storeAuthors)
+
+  function storeAuthors(){
     var iconList = {}
 
     $('.icon-author').each(function(){
       iconList[$(this).attr('data-filename')] = $(this).val()
     })
 
-    $.post('store.php', { list: iconList })
-  })
+    $.post('index.php', { list: iconList }, function(data){ console.log(data) })
+  }
 
   $('svg').each(function(i, svg){
     var areas = []

extras/icon_authors/list.json

@@ -58,7 +58,7 @@
     "switchView.svg": "",
     "team.svg": "",
     "templates.svg": "Felix Niklas",
-    "tools.svg": "",
+    "tools.svg": "Michael Kussmaul",
     "total-tickets.svg": "",
     "trash.svg": "Felix Niklas",
     "twitter.svg": "",

extras/icon_authors/store.php

@@ -1,9 +0,0 @@
-<?
-
-// check for ajax request
-if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
-  file_put_contents('list.json', json_encode($_POST['list'], JSON_PRETTY_PRINT));
-  exit();
-}
-
-?>

public/assets/images/icons/overviews.svg

@@ -6,7 +6,7 @@
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="overviews" sketch:type="MSArtboardGroup" fill="#50E3C2">
-            <path d="M10,6 L20,6 C21.308403,6 22,5.10537191 22,4 C22,2.8946281 21.308403,2 20,2 L10,2 C8.692595,2 8,2.8946281 8,4 C8,5.10537191 8.692595,6 10,6 L10,6 L10,6 Z M20,9 L10,9 C8.692595,9 8,9.8970323 8,11 C8,12.1052903 8.692595,13 10,13 L20,13 C21.308403,13 22,12.1052903 22,11 C22,9.8972903 21.308403,9 20,9 L20,9 L20,9 Z M20,17 L10,17 C8.692595,17 8,17.897464 8,19 C8,20.1043428 8.692595,21 10,21 L20,21 C21.308403,21 22,20.1043428 22,19 C22,17.897464 21.308403,17 20,17 L20,17 L20,17 Z M4,2 C2.6750463,2 2,2.8946281 2,4 C2,5.10511364 2.6750463,6 4,6 C5.3251486,6 6,5.10537191 6,4 C6,2.8946281 5.3249537,2 4,2 L4,2 L4,2 Z M4,9 C2.6750463,9 2,9.8970323 2,11 C2,12.1052903 2.6750463,13 4,13 C5.3251486,13 6,12.1052903 6,11 C6,9.8972903 5.3249537,9 4,9 L4,9 L4,9 Z M4,17 C2.6750463,17 2,17.897464 2,19 C2,20.1043428 2.6750463,21 4,21 C5.3251486,21 6,20.1043428 6,19 C6,17.897464 5.3249537,17 4,17 L4,17 L4,17 Z" sketch:type="MSShapeGroup"></path>
+            <path d="M10,7 L20,7 C21.308403,7 22,6.10537191 22,5 C22,3.8946281 21.308403,3 20,3 L10,3 C8.692595,3 8,3.8946281 8,5 C8,6.10537191 8.692595,7 10,7 L10,7 L10,7 Z M20,10 L10,10 C8.692595,10 8,10.8970323 8,12 C8,13.1052903 8.692595,14 10,14 L20,14 C21.308403,14 22,13.1052903 22,12 C22,10.8972903 21.308403,10 20,10 L20,10 L20,10 Z M20,17 L10,17 C8.692595,17 8,17.897464 8,19 C8,20.1043428 8.692595,21 10,21 L20,21 C21.308403,21 22,20.1043428 22,19 C22,17.897464 21.308403,17 20,17 L20,17 L20,17 Z M4,3 C2.6750463,3 2,3.8946281 2,5 C2,6.10511364 2.6750463,7 4,7 C5.3251486,7 6,6.10537191 6,5 C6,3.8946281 5.3249537,3 4,3 L4,3 L4,3 Z M4,10 C2.6750463,10 2,10.8970323 2,12 C2,13.1052903 2.6750463,14 4,14 C5.3251486,14 6,13.1052903 6,12 C6,10.8972903 5.3249537,10 4,10 L4,10 L4,10 Z M4,17 C2.6750463,17 2,17.897464 2,19 C2,20.1043428 2.6750463,21 4,21 C5.3251486,21 6,20.1043428 6,19 C6,17.897464 5.3249537,17 4,17 L4,17 L4,17 Z" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>

public/assets/images/icons/split.svg

@@ -6,7 +6,7 @@
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="split" sketch:type="MSArtboardGroup" fill="#50E3C2">
-            <path d="M2,12 C2.00000017,9.77255378 2.70611078,8.64044 4.44274599,7.21806489 C4.41024816,7.24468267 4.76798133,6.95277156 4.86223813,6.87472533 C6.4156106,5.58851644 7.00000005,4.51402489 7,2 L7,2 L9,2 C9.00000009,4.51402489 9.58438951,5.58851556 11.1377619,6.87472533 C11.2320188,6.95277067 11.5897519,7.24468267 11.5572541,7.21806489 C13.2938892,8.64044 13.9999999,9.77255378 14,12 L14.0000001,12 L10,12 L13,15.3333333 L16,12 L14,12 L12,12 C11.9999999,10.4739262 11.607247,9.84422133 10.2899828,8.765328 C10.3277604,8.79626933 9.96299413,8.49861956 9.86223813,8.41519289 C8.94522347,7.65589422 8.26441875,6.90252356 7.79738232,6 L8.20261788,6 C7.73558144,6.90252444 7.0547766,7.65589422 6.13776187,8.41519289 C6.03700589,8.49861956 5.67223971,8.79627022 5.71001736,8.76532889 C4.39275298,9.84422133 4.0000001,10.4739262 4,12 L2,12 L6,12 L3,15.3333333 L0,12 L1.99999994,12 L2,12 L2,12 Z" sketch:type="MSShapeGroup"></path>
+            <path d="M4.44274599,7.21806489 C4.41024816,7.24468267 4.76798133,6.95277156 4.86223813,6.87472533 C6.4156106,5.58851644 7.00000005,4.51402489 7,2 L9,2 C9.00000009,4.51402489 9.58438951,5.58851556 11.1377619,6.87472533 C11.2320188,6.95277067 11.5897519,7.24468267 11.5572541,7.21806489 C13.2938892,8.64044 13.9999999,9.77255378 14,12 L10,12 L13,15.3333333 L16,12 L14,12 L12,12 C11.9999999,10.4739262 11.607247,9.84422133 10.2899828,8.765328 C10.3277604,8.79626933 9.96299413,8.49861956 9.86223813,8.41519289 C8.94522347,7.65589422 8.5,7.5 8,6.4 C7.5,7.5 7.0547766,7.65589422 6.13776187,8.41519289 C6.03700589,8.49861956 5.67223971,8.79627022 5.71001736,8.76532889 C4.39275298,9.84422133 4.0000001,10.4739262 4,12 L2,12 L6,12 L3,15.3333333 L0,12 L1.99999994,12 C2.00000017,9.77255378 2.70611078,8.64044 4.44274599,7.21806489 Z" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>

public/assets/images/icons/tools.svg

@@ -6,7 +6,7 @@
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tools" sketch:type="MSArtboardGroup" fill="#50E3C2">
-            <path d="M12,21.9917334 C13.629647,21.9917334 14.950737,20.8761463 14.950737,19.4999999 C14.950737,18.1238535 13.629647,17.0082666 12,17.0082666 C10.370353,17.0082666 9.049263,18.1238535 9.049263,19.4999999 C9.049263,20.8761463 10.370353,21.9917334 12,21.9917334 L12,21.9917334 L12,21.9917334 Z M12,13.9917334 C13.629647,13.9917334 14.950737,12.8761463 14.950737,11.4999999 C14.950737,10.1238535 13.629647,9.00826665 12,9.00826665 C10.370353,9.00826665 9.049263,10.1238535 9.049263,11.4999999 C9.049263,12.8761463 10.370353,13.9917334 12,13.9917334 L12,13.9917334 L12,13.9917334 Z M12,6.99173331 C13.629647,6.99173331 14.950737,5.87614637 14.950737,4.49999998 C14.950737,3.12385359 13.629647,2.00826665 12,2.00826665 C10.370353,2.00826665 9.049263,3.12385359 9.049263,4.49999998 C9.049263,5.87614637 10.370353,6.99173331 12,6.99173331 L12,6.99173331 L12,6.99173331 Z" sketch:type="MSShapeGroup"></path>
+            <path d="M2.57823947,1.00295582 L5.18527273,2.88581317 L5.18527273,3.60998908 L10.6890096,9.25856114 L9.38549298,10.5620778 L3.59208574,4.91350571 L2.86790983,4.91350571 L1.12988766,2.45130763 L2.57823947,1.00295582 Z M15.6134058,12.4449351 C15.6134058,12.4449351 21.9861537,18.8176831 22.5654945,19.3970238 C23.1448352,19.9763645 23.1448352,21.2798812 22.5654945,21.8592219 C21.9861537,22.4385626 22.5654945,21.8592219 21.9861537,22.4385626 C21.406813,23.0179033 19.9584612,22.8730682 19.3791205,22.2937274 L12.7167021,15.6313091 L15.6134058,12.4449351 Z M16.0479113,4.47900017 L19.2342853,7.81020933 L22.7103296,4.62383535 C22.7103296,4.62383535 23,8.53438524 21.1171426,9.98273705 C19.2342853,11.4310889 19.379121,11.2862537 17.6410988,10.9965834 C15.9030766,10.706913 15.3237354,11.1414185 14.7443947,11.7207592 C14.165054,12.3000999 5.33010791,21.7143867 4.75076719,22.2937274 C4.17142646,22.8730682 3.15758016,23.1627375 2.43340425,22.4385616 C1.70922835,21.7143857 2.43340428,22.4385616 1.56439319,21.5695505 C0.695382104,20.7005394 0.938077263,19.7336694 1.5643932,19.1073535 C2.28856911,18.3831775 12.4270318,8.8240556 12.4270318,8.8240556 C12.4270318,8.8240556 13.2960424,8.38955005 13.0063725,6.5066927 C12.7167027,4.62383535 11.7028554,4.33416498 14.165054,2.59614281 C16.6272526,0.858120639 19.3791205,1.00295582 19.3791205,1.00295582 L16.0479113,4.47900017 Z" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>