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

add cloud, package and list task-icons

Browse source 
and clean up
This commit is contained in:
Felix Niklas 2015-01-22 15:50:33 +01:00
parent 218c247478
commit ec20859ba0
3 changed files with 90 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<% for item in @item_list: %> <% for item in @item_list: %>
<a href="<%- item.data.url %>" title="<%= item.data.title %>" class="task <%= item.data.class %> horizontal center <% if item.task.active: %>active<% end %>" data-key="<%- item.task.key %>"> <a href="<%- item.data.url %>" title="<%= item.data.title %>" class="task <%= item.data.class %> <% if item.task.active: %>active<% end %>" data-key="<%- item.task.key %>">
<div class="icon-holder centered"> <div class="icon-holder centered">
<div class="<%= item.data.iconClass %> icon<% if item.task.notify: %> modified<% end %>"></div> <div class="<% if item.task.active: %>white <% end %><%= item.data.iconClass %> icon<% if item.task.notify: %> modified<% end %>"></div>
</div> </div>
<div class="name u-textTruncate flex"><%= item.data.head %></div> <div class="name u-textTruncate flex"><%= item.data.head %></div>
<div class="closeTask js-close u-clickable horizontal centered" title="<%- @T('close') %>"> <div class="closeTask js-close u-clickable horizontal centered" title="<%- @T('close') %>">

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

@ -1357,7 +1357,6 @@ ol.tabs li {
} }
.icon-switch:hover .organization.icon, .icon-switch:hover .organization.icon,
.task.active .organization.icon,
.white.organization.icon { .white.organization.icon {
background-position: 0 -132px; background-position: 0 -132px;
} }
@ -1369,7 +1368,6 @@ ol.tabs li {
} }
.icon-switch:hover .user.icon, .icon-switch:hover .user.icon,
.task.active .user.icon,
.white.user.icon { .white.user.icon {
background-position: -15px -132px; background-position: -15px -132px;
} }
@ -1381,7 +1379,6 @@ ol.tabs li {
} }
.icon-switch:hover .note.icon, .icon-switch:hover .note.icon,
.task.active .note.icon,
.white.note.icon { .white.note.icon {
background-position: -30px -132px; background-position: -30px -132px;
} }
@ -1393,7 +1390,6 @@ ol.tabs li {
} }
.icon-switch:hover .pen.icon, .icon-switch:hover .pen.icon,
.task.active .pen.icon,
.white.pen.icon { .white.pen.icon {
background-position: -45px -132px; background-position: -45px -132px;
} }
@ -1404,7 +1400,6 @@ ol.tabs li {
background-position: -60px -118px; background-position: -60px -118px;
} }
.icon-switch:hover .important.icon, .icon-switch:hover .important.icon,
.task.active .important.icon,
.white.important.icon { .white.important.icon {
background-position: -60px -132px; background-position: -60px -132px;
} }
@ -1415,7 +1410,6 @@ ol.tabs li {
background-position: -75px -118px; background-position: -75px -118px;
} }
.icon-switch:hover .tools.icon, .icon-switch:hover .tools.icon,
.task.active .tools.icon,
.white.tools.icon { .white.tools.icon {
background-position: -75px -132px; background-position: -75px -132px;
} }
@ -1426,7 +1420,6 @@ ol.tabs li {
background-position: -90px -118px; background-position: -90px -118px;
} }
.icon-switch:hover .clock.icon, .icon-switch:hover .clock.icon,
.task.active .clock.icon,
.white.clock.icon { .white.clock.icon {
background-position: -90px -132px; background-position: -90px -132px;
} }
@ -1434,10 +1427,37 @@ ol.tabs li {
.team.icon { .team.icon {
height: 13px; height: 13px;
width: 20px; width: 20px;
background-position: -105px -118px; background-position: -104px -118px;
} }
.white.team.icon { .white.team.icon {
background-position: -105px -132px; background-position: -104px -132px;
}
.cloud.icon {
height: 12px;
width: 15px;
background-position: -125px -119px;
}
.white.cloud.icon {
background-position: -125px -133px;
}
.package.icon {
height: 16px;
width: 15px;
background-position: -141px -112px;
}
.white.package.icon {
background-position: -141px -129px;
}
.list.icon {
height: 14px;
width: 15px;
background-position: -157px -116px;
}
.white.list.icon {
background-position: -157px -131px;
} }
.channel.icon { .channel.icon {
@ -2076,6 +2096,8 @@ footer {
padding: 10px 15px 7px 0; padding: 10px 15px 7px 0;
position: relative; position: relative;
@extend .u-clickable; @extend .u-clickable;
@extend .horizontal;
@extend .center;
} }
.tasks-navigation .task { .tasks-navigation .task {

86
public/assets/images/sprite.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 115 KiB