Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Martin Edenhofer 2015-09-07 14:07:30 +02:00
commit a3cacdbe20
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/views/task_widget_tasks.jst.eco
View file

@ -4,7 +4,7 @@
<% if item.task.notify && item.data.iconClass is 'priority': %> <% if item.task.notify && item.data.iconClass is 'priority': %>
<%- @Icon('priority-modified-outer-circle', "icon-#{item.data.iconClass}") %> <%- @Icon('priority-modified-outer-circle', "icon-#{item.data.iconClass}") %>
<% else: %> <% else: %>
<%- @Icon(item.data.iconClass, "icon-#{item.data.iconClass}") %> <%- @Icon(item.data.iconClass) %>
<% end %> <% end %>
<% if item.task.notify && item.data.iconClass is 'priority': %> <% if item.task.notify && item.data.iconClass is 'priority': %>
<%- @Icon('priority-modified-inner-circle', "modified-inner-circle icon-#{item.data.iconClass}") %> <%- @Icon('priority-modified-inner-circle', "modified-inner-circle icon-#{item.data.iconClass}") %>

7
app/assets/stylesheets/zammad.css.scss
View file

@ -2116,6 +2116,13 @@ footer {
.nav-tab-icon .icon.icon-loading { .nav-tab-icon .icon.icon-loading {
animation: rotateplane 1.2s infinite ease-in-out; animation: rotateplane 1.2s infinite ease-in-out;
fill: $supergood-color; fill: $supergood-color;
/*
Safari font rendering bugfix while animating
http://stackoverflow.com/questions/9733011/safari-changing-font-weights-when-unrelated-animations-are-running
*/
z-index: 60000;
position: relative;
} }
.nav-tab-close { .nav-tab-close {