From d4bd04e7ea962c1e9fea90e38fd30273ca012b5a Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 9 Nov 2015 17:52:15 +0100 Subject: [PATCH] rename "state-color supergood-state" to "supergood-color" etc --- .../app/controllers/widget/ticket_stats.coffee | 4 ++-- .../javascripts/app/views/dashboard/stats.jst.eco | 6 +++--- .../app/views/layout_ref/user_profile.jst.eco | 12 ++++++------ app/assets/stylesheets/zammad.scss | 12 +++++------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee b/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee index edb36c1c3..7ec299050 100644 --- a/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee +++ b/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee @@ -69,7 +69,7 @@ class App.TicketStats extends App.Controller limit = 5 iconClass = '' if data.user_tickets_open_ids.length is 0 && data.user_tickets_closed_ids.length > 0 - iconClass = 'mood icon supergood-state' + iconClass = 'mood icon supergood-color' new TicketStatsList( el: @$('.js-user-open-tickets') user: @user @@ -93,7 +93,7 @@ class App.TicketStats extends App.Controller iconClass = '' if data.org_tickets_open_ids.length is 0 && data.org_tickets_closed_ids.length > 0 - iconClass = 'mood icon supergood-state' + iconClass = 'mood icon supergood-color' new TicketStatsList( el: @$('.js-org-open-tickets') user: @user diff --git a/app/assets/javascripts/app/views/dashboard/stats.jst.eco b/app/assets/javascripts/app/views/dashboard/stats.jst.eco index 8f652103e..0f3d087dc 100644 --- a/app/assets/javascripts/app/views/dashboard/stats.jst.eco +++ b/app/assets/javascripts/app/views/dashboard/stats.jst.eco @@ -46,7 +46,7 @@
<% stack_counter = parseInt(@StatsTicketLoadMeasure.percent*0.16) %> <% for count in [1..stack_counter]: %> - <%- @Icon('one-ticket', "one-ticket state-color #{@StatsTicketLoadMeasure.state}-state") %> + <%- @Icon('one-ticket', "one-ticket #{@StatsTicketLoadMeasure.state}-color") %> <% end %>
<%- @Icon('total-tickets', 'total-tickets') %> @@ -59,7 +59,7 @@
<%- @T('Your Tickets in process') %>
- <%- @Icon('in-process', "in-process-icon state-color #{@StatsTicketInProcess.state}-state") %> + <%- @Icon('in-process', "in-process-icon #{@StatsTicketInProcess.state}-color") %>
<%- @T('%s% are currently in process', @StatsTicketInProcess.percent) %>
<%- @T('Average: %s%', @StatsTicketInProcess.average_per_agent) %>
@@ -69,7 +69,7 @@
<%- @T('Reopening rate') %>
- <%- @Icon('reopening', "reopening-icon state-color #{@StatsTicketReopen.state}-state") %> + <%- @Icon('reopening', "reopening-icon #{@StatsTicketReopen.state}-color") %>
<%- @T('%s% are being reopened', @StatsTicketReopen.percent) %>
<%- @T('Average: %s%', @StatsTicketReopen.average_per_agent) %>
diff --git a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco index d2736f8f5..5f2de1eac 100644 --- a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco @@ -146,12 +146,12 @@
Status
- <%- @Icon('one-ticket', 'one-ticket state-color supergood-state') %> - <%- @Icon('one-ticket', 'one-ticket state-color supergood-state') %> - <%- @Icon('one-ticket', 'one-ticket state-color supergood-state') %> - <%- @Icon('one-ticket', 'one-ticket state-color supergood-state') %> - <%- @Icon('one-ticket', 'one-ticket state-color supergood-state') %> - <%- @Icon('one-ticket', 'one-ticket state-color supergood-state') %> + <%- @Icon('one-ticket', 'one-ticket supergood-color') %> + <%- @Icon('one-ticket', 'one-ticket supergood-color') %> + <%- @Icon('one-ticket', 'one-ticket supergood-color') %> + <%- @Icon('one-ticket', 'one-ticket supergood-color') %> + <%- @Icon('one-ticket', 'one-ticket supergood-color') %> + <%- @Icon('one-ticket', 'one-ticket supergood-color') %>
<%- @Icon('total-tickets', 'total-tickets') %>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 4b6b485f4..089ff7c9b 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -3498,13 +3498,11 @@ footer { height: 47px; } -.state-color { - &.supergood-state { fill: $supergood-color;} - &.good-state { fill: $good-color; } - &.ok-state { fill: $ok-color; } - &.bad-state { fill: $bad-color; } - &.superbad-state { fill: $superbad-color; } -} +.supergood-color { fill: $supergood-color;} +.good-color { fill: $good-color; } +.ok-color { fill: $ok-color; } +.bad-color { fill: $bad-color; } +.superbad-color { fill: $superbad-color; } .stat-widgets { margin: 0 -7px 20px;