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

Conflicts:
	app/assets/javascripts/app/views/generic/datetime.jst.eco

app/assets/javascripts/app/views/generic/datetime.jst.eco

@@ -1,6 +1,6 @@
-<div class="controls--bundle u-positionOrigin" data-name="<%= @attribute.nameRaw %>">
+<div class="horizontal u-positionOrigin" data-name="<%= @attribute.nameRaw %>">
   <input type="hidden" value="<%= @attribute.value %>" name="<%= @attribute.name %>">
-  <input type="text" value="" class="form-control js-datepicker" data-item="date">
+  <input type="text" value="" class="form-control flex-shrink-horizontal js-datepicker" data-item="date">
   <div class="controls-label"><%- @T('at') %></div>
   <input type="text" value="" class="form-control time js-timepicker" data-item="time">
 </div>

app/assets/javascripts/app/views/task_widget_tasks.jst.eco

@@ -3,13 +3,11 @@
     <div class="nav-tab-icon" title="<%- @T(item.data.iconTitle) %>">
       <% if item.data.type is 'task': %>
         <% if item.task.notify: %>
-          <%- @Icon('task-state-modified-outer-circle', "icon-task-state #{item.data.iconClass}") %>
+          <%- @Icon('status-modified-inner-circle', "icon-task-state #{item.data.iconClass}") %>
+          <%- @Icon('status-modified-outer-circle', "icon-task-state #{item.data.iconClass}") %>
         <% else: %>
           <%- @Icon('task-state', item.data.iconClass) %>
         <% end %>
-        <% if item.task.notify: %>
-          <%- @Icon('task-state-modified-inner-circle', "modified-inner-circle icon-task-state #{item.data.iconClass}") %>
-        <% end %>
       <% else: %>
         <%- @Icon(item.data.iconClass) %>
       <% end %>

app/assets/stylesheets/zammad.scss

@@ -1193,13 +1193,9 @@ fieldset > .form-group {
   margin-bottom: 0;
 }
 
-.controls--bundle {
-  display: flex;
-
-  .controls-label {
+.controls-label {
   margin: 11px 10px 0;
   flex-shrink: 0;
-  }
 }
 
 input[type="radio"], 
@@ -2388,7 +2384,7 @@ footer {
     }
 
   .nav-tab {
-    padding: 11px 15px 8px 0;
+    padding: 10px 15px 9px 0;
     position: relative;
     color: #808080;
     display: flex;
@@ -6977,6 +6973,21 @@ body.fit {
   flex: 1;
 }
 
+/*
+
+  Firefox minimum content bugfix
+  
+  https://github.com/philipwalton/flexbugs#1-minimum-content-sizing-of-flex-items-not-honored
+
+  "By default, flex items won’t shrink below their minimum 
+  content size (the length of the longest word or fixed-size element). 
+  To change this, set the min-width or min-height property."
+  
+*/
+.flex-shrink-horizontal {
+  min-width: 0;
+}
+
 .flex-full {
   flex: 1 1 100%;
 }