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

Conflicts:
	app/assets/javascripts/app/views/dashboard/stats.jst.eco

app/assets/javascripts/app/views/channel/email_account_overview.jst.eco

@@ -1,7 +1,7 @@
-<h1><%- @T('Email Accounts') %></h1>
+<h2><%- @T('Email Accounts') %></h2>
 
 <% if !_.isEmpty(@accounts_fixed): %>
-<h2><%- @T('Fixed email addresses') %></h2>
+<h3><%- @T('Fixed email addresses') %></h3>
 <ul>
   <% for email_address in @accounts_fixed: %>
     <li><%= email_address.realname %> &lt;<%= email_address.email %>&gt;
@@ -10,7 +10,7 @@
 <% end %>
 
 <% if !_.isEmpty(@not_used_email_addresses): %>
-<h2><%- @T('Not linked email addresses') %></h2>
+<h3><%- @T('Not linked email addresses') %></h3>
 <ul>
 <% for email_address in @not_used_email_addresses: %>
   <li data-id="<%= email_address.id %>"><a href="" data-type="email-address-edit"><%= email_address.email %></a>
@@ -83,7 +83,7 @@
 <a data-type="new" class="btn btn--success"><%- @T('New') %></a>
 
 <% if !_.isEmpty(@notification_channels) && !App.Config.get('system_online_service'): %>
-  <h1><%- @T('Notification Account') %></h1>
+  <h2><%- @T('Notification Account') %></h2>
 
   <table class="table table-hover user-list">
     <thead>

app/assets/javascripts/app/views/dashboard/stats.jst.eco

@@ -1,6 +1,6 @@
 <div class="column">
   <div class="time stat-widget vertical">
-    <h3><%- @T('∅ Waiting time today') %></h3>
+    <div class="stat-title"><%- @T('∅ Waiting time today') %></div>
     <div class="stat-graphic">
       <div class="stat-stopwatch centered">
         <%- @Icon('stopwatch', 'stat-icon stopwatch-icon') %>
@@ -14,7 +14,7 @@
 </div>
 <div class="column">
   <div class="mood stat-widget vertical">
-    <h3><%- @T('Mood') %></h3>
+    <div class="stat-title"><%- @T('Mood') %></div>
     <div class="stat-graphic">
       <%- @Icon("mood-#{@StatsTicketEscalation.state}", 'stat-icon mood-icon') %>
     </div>
@@ -24,7 +24,7 @@
 </div>
 <div class="column">
   <div class="channel-distribution stat-widget vertical centered">
-    <h3><%- @T('Channel Distribution') %></h3>
+    <div class="stat-title"><%- @T('Channel Distribution') %></div>
     <div class="stat-graphic">
       <% for channel_name, channel of @StatsTicketChannelDistribution.channels: %>
       <div class="stats-row email-channel">
@@ -41,7 +41,7 @@
 </div>
 <div class="column">
   <div class="status stat-widget vertical">
-    <h3><%- @T('Assigned') %></h3>
+    <div class="stat-title"><%- @T('Assigned') %></div>
     <div class="stat-graphic">
       <div class="stat-tickets vertical reverse end">
         <% stack_counter = parseInt(@StatsTicketLoadMeasure.percent*0.16) %>
@@ -57,7 +57,7 @@
 </div>
 <div class="column">
   <div class="in-process stat-widget vertical">
-    <h3><%- @T('Your Tickets in process') %></h3>
+    <div class="stat-title"><%- @T('Your Tickets in process') %></div>
     <div class="stat-graphic">
       <%- @Icon('in-process', "in-process-icon state-color #{@StatsTicketInProcess.state}-state") %>
     </div>
@@ -67,7 +67,7 @@
 </div>
 <div class="column">
   <div class="reopening stat-widget vertical">
-    <h3><%- @T('Reopening rate') %></h3>
+    <div class="stat-title"><%- @T('Reopening rate') %></div>
     <div class="stat-graphic">
       <%- @Icon('reopening', "reopening-icon state-color #{@StatsTicketReopen.state}-state") %>
     </div>

app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco

@@ -230,7 +230,7 @@ Oliver<br>
               </div>
               <div class="attachments">
                 <svg class="icon-paperclip"><use xlink:href="#icon-paperclip" /></svg>
-                <h3>2 <%- @T('Attached Files') %></h3>
+                <div class="attachments-title">2 <%- @T('Attached Files') %></div>
                 <div class="attachment">
                   <div class="attachment-name u-highlight">midinotes_view.jpg</div>
                   <div class="attachment-size">35.5 kb</div>

app/assets/javascripts/app/views/layout_ref/highlight.jst.eco

@@ -273,7 +273,7 @@ Oliver<br></div>
               </div>
               <div class="attachments">
                 <svg class="icon-paperclip"><use xlink:href="#icon-paperclip" /></svg>
-                <h3>2 <%- @T('Attached Files') %></h3>
+                <div class="attachments-title">2 <%- @T('Attached Files') %></div>
                 <div class="attachment">
                   <div class="attachment-name u-highlight">midinotes_view.jpg</div>
                   <div class="attachment-size">35.5 kb</div>

app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco

@@ -411,7 +411,7 @@
     </div>
     <div class="profile-section horizontal two-columns">
       <div class="column status stat-widget vertical">
-        <h3>Status</h3>
+        <div class="stat-title">Status</div>
         <div class="stat-graphic">
           <div class="stat-tickets vertical reverse end">
             <div class="stat-ticket icon supergood-state"></div>
@@ -430,7 +430,7 @@
         <div class="stat-detail">Average: 22%</div>
       </div>
       <div class="column mood stat-widget vertical">
-        <h3>Stimmung</h3>
+        <div class="stat-title">Stimmung</div>
         <div class="stat-graphic">
           <div class="mood icon supergood-state"></div>
         </div>
@@ -440,7 +440,7 @@
     </div>
     <div class="profile-section">
       <div class="frequency stat-widget vertical">
-        <h3><%- @T('Frequency') %></h3>
+        <div class="stat-title"><%- @T('Frequency') %></div>
         <div class="stat-graphic">
           <div class="stats-row">
             <div class="stat-bars">

app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco

@@ -135,7 +135,7 @@
     </div>
     <div class="profile-section">
       <div class="frequency stat-widget vertical">
-        <h3><%- @T('Frequency') %></h3>
+        <div class="stat-title"><%- @T('Frequency') %></div>
         <div class="stat-graphic">
           <div class="stats-row">
             <div class="stat-bars">

app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco

@@ -143,7 +143,7 @@
     </div>
     <div class="profile-section horizontal two-columns">
       <div class="column status stat-widget vertical">
-        <h3>Status</h3>
+        <div class="stat-title">Status</div>
         <div class="stat-graphic">
           <div class="stat-tickets vertical reverse end">
             <svg class="one-ticket state-color supergood-state"><use xlink:href="#icon-one-ticket" /></svg>
@@ -162,7 +162,7 @@
         <div class="stat-detail">Average: 22%</div>
       </div>
       <div class="column mood stat-widget vertical">
-        <h3>Stimmung</h3>
+        <div class="stat-title">Stimmung</div>
         <div class="stat-graphic">
           <svg class="stat-icon mood-icon"><use xlink:href="#icon-mood-supergood" /></svg>
         </div>
@@ -172,7 +172,7 @@
     </div>
     <div class="profile-section">
       <div class="frequency stat-widget vertical">
-        <h3>Frequency</h3>
+        <div class="stat-title">Frequency</div>
         <div class="stat-graphic">
           <div class="stats-row">
             <div class="stat-bars">

app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco

@@ -49,7 +49,7 @@
         <% if !_.isEmpty( @article.attachments ): %>
           <div class="attachments">
             <%- @Icon('paperclip') %>
-            <h3><%- @article.attachments.length %> <%- @T('Attached Files') %></h3>
+            <div class="attachments-title"><%- @article.attachments.length %> <%- @T('Attached Files') %></div>
             <% for attachment in @article.attachments: %>
               <div class="attachment">
                 <a class="attachment-name u-highlight" href="<%= App.Config.get('api_path') %>/ticket_attachment/<%= @article.ticket_id %>/<%= @article.id %>/<%= attachment.id %>" target="_blank" data-type="attachment"><%= attachment.filename %></a>

app/assets/javascripts/app/views/widget/ticket_stats_frequency.jst.eco

@@ -1,4 +1,4 @@
-<h3><%- @T('Frequency') %></h3>
+<div class="stat-title"><%- @T('Frequency') %></div>
 <div class="stat-graphic">
   <% for item in @ticket_volume_by_year: %>
     <div class="stats-row">

app/assets/stylesheets/zammad.css.scss

@@ -738,17 +738,15 @@ h1 {
 
 h2,
 h2.popover-title {
-  font-size: 19px;
+  font-size: 20px;
   line-height: 25px;
 }
 
 h3 {
-  font-size: 13px;
+  font-size: 16px;
   margin: 20px 0 8px;
-  color: #a9bcc4;
+  color: hsl(207,7%,29%);
-  font-weight: 200;
+  font-weight: normal;
-  text-transform: uppercase;
-  letter-spacing: 0.07em;
   
   .subtitle {
     display: inline;
@@ -760,11 +758,13 @@ h3 {
 }
 
 h4 {
-  font-size: 20px;
+  font-size: 13px;
+  text-transform: uppercase;
 }
 
 h5 {
-  font-size: 16px;
+  font-size: 13px;
+  font-weight: bold;
 }
 
 label,
@@ -2870,10 +2870,11 @@ footer {
     box-shadow: 0 1px rgba(0,8,14,.02);
   }
 
-    .stat-widget h3 {
+    .stat-title {
+      font-size: 13px;
       margin: 2px 0 8px;
       color: #444a4f;
-      letter-spacing: 0;
+      text-transform: uppercase;
       font-weight: normal;
     }
 
@@ -3442,9 +3443,9 @@ footer {
     position: relative;
   }
 
-    .ticket-article-item .attachments h3 {
+    .ticket-article-item .attachments .attachments-title {
+      font-size: 13px;
       color: hsl(60,1%,34%);
-      letter-spacing: 0;
       font-weight: bold;
       padding: 0 7px;
       margin: 0 0 4px;