From 197b8a2b93f8bac51b6fbb37c49c25694f266c8b Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 30 Sep 2015 15:12:45 +0200 Subject: [PATCH] Sla: move calendar into new row --- app/assets/javascripts/app/views/sla/index.jst.eco | 12 ++++++++---- app/assets/stylesheets/zammad.scss | 3 +-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/app/views/sla/index.jst.eco b/app/assets/javascripts/app/views/sla/index.jst.eco index 0ef2612cb..21c866847 100644 --- a/app/assets/javascripts/app/views/sla/index.jst.eco +++ b/app/assets/javascripts/app/views/sla/index.jst.eco @@ -31,19 +31,23 @@
<%- @T('Escalation Times') %>
<% if sla.first_response_time: %> - <%- sla.first_response_time_in_text %> <%- @T('hours') %> - <%- @T('First Response Time') %>
+ <%- sla.first_response_time_in_text %> <%- @T('hours') %> - <%- @T('First Response Time') %> <% end %> <% if sla.update_time: %> - <%- sla.update_time_in_text %> <%- @T('hours') %> - <%- @T('Update Time') %>
+
+ <%- sla.update_time_in_text %> <%- @T('hours') %> - <%- @T('Update Time') %> <% end %> <% if sla.solution_time: %> +
<%- sla.solution_time_in_text %> <%- @T('hours') %> - <%- @T('Solution Time') %> <% end %>
-
<%- @T('Calendar') %>
- <%= sla.calendar.displayName() %>
+
+
<%- @T('Calendar') %>
+ <%= sla.calendar.displayName() %> +
<%- @T('Delete') %>
<%- @T('Edit') %>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index ecaa1d035..ce219a570 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -6293,10 +6293,9 @@ output { } .action-flow-icon { - align-self: center; width: 15px; height: 24px; - margin-top: 20px; /* compensate for h3 height */ + margin-top: 16px; /* compensate for h3 height */ margin-left: 20px; margin-right: 20px; fill: hsl(198,17%,89%);