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

Added more icons.

Browse source
This commit is contained in:
Martin Edenhofer 2014-07-26 08:12:59 +02:00
parent 7b47ed17f5
commit 3ab6773c8c
6 changed files with 62 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/assets/images/sprite.svg
View file

@ -169,6 +169,29 @@
</g>
</g>
</g>
<g id="icon_2176" transform="translate(62.000000, 115.000000)" fill="#808080" sketch:type="MSShapeGroup">
<path d="M2.63178947,9.13309091 C2.63178947,9.21286364 2.61331579,9.28259091 2.57589474,9.34227273 C2.53863158,9.40210227 2.472,9.45218182 2.37584211,9.49206818 C2.28015789,9.53195455 2.15747368,9.56194318 2.00857895,9.58159091 C1.85905263,9.60168182 1.67257895,9.61157955 1.449,9.61157955 C1.22510526,9.61157955 1.03863158,9.60168182 0.889421053,9.58159091 C0.740210526,9.56179545 0.617842105,9.53180682 0.521684211,9.49206818 C0.426,9.45218182 0.359052632,9.40225 0.322105263,9.34227273 C0.284526316,9.28259091 0.266052632,9.21286364 0.266052632,9.13309091 L-0.00568421053,0.731397727 C-0.0162631579,0.611738636 -0.000473684211,0.507147727 0.0423157895,0.417477273 C0.0849473684,0.327806818 0.162157895,0.252909091 0.274105263,0.193079545 C0.386052632,0.13325 0.535105263,0.091 0.721578947,0.0660340909 C0.907894737,0.0412159091 1.15026316,0.0286590909 1.44884211,0.0286590909 C1.73636842,0.0286590909 1.97352632,0.0437272727 2.16031579,0.0734204545 C2.34663158,0.103409091 2.49584211,0.148318182 2.60778947,0.208147727 C2.71942105,0.267977273 2.79663158,0.340363636 2.83957895,0.425011364 C2.88189474,0.509806818 2.90336842,0.611886364 2.90336842,0.731545455 L2.63178947,9.13309091 L2.63178947,9.13309091 Z" id="Shape"></path>
<path d="M2.95926316,11.6175682 C2.95926316,12.2966705 2.28173684,12.8463636 1.44757895,12.8463636 C1.24910526,12.8463636 1.06105263,12.8154886 0.887210526,12.7590568 C0.644842105,12.8831477 0.429157895,12.9677955 0.140368421,13.0208295 C0.0541578947,13.037375 0.0198947368,13.03575 0.0123157895,13.0257045 C0.00378947368,13.0138864 0.0320526316,12.9908409 0.0571578947,12.9719318 C0.336789474,12.7677727 0.383526316,12.6608182 0.451105263,12.5410114 C0.135,12.3169091 -0.0644210526,11.986 -0.0644210526,11.6174205 C-0.0644210526,10.9383182 0.612,10.3877386 1.44757895,10.3877386 C2.28173684,10.3877386 2.95926316,10.9384659 2.95926316,11.6175682 L2.95926316,11.6175682 Z" id="Shape"></path>
</g>
<g id="icon_2176-2" transform="translate(60.000000, 129.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
<path d="M2.63178947,9.13309091 C2.63178947,9.21286364 2.61331579,9.28259091 2.57589474,9.34227273 C2.53863158,9.40210227 2.472,9.45218182 2.37584211,9.49206818 C2.28015789,9.53195455 2.15747368,9.56194318 2.00857895,9.58159091 C1.85905263,9.60168182 1.67257895,9.61157955 1.449,9.61157955 C1.22510526,9.61157955 1.03863158,9.60168182 0.889421053,9.58159091 C0.740210526,9.56179545 0.617842105,9.53180682 0.521684211,9.49206818 C0.426,9.45218182 0.359052632,9.40225 0.322105263,9.34227273 C0.284526316,9.28259091 0.266052632,9.21286364 0.266052632,9.13309091 L-0.00568421053,0.731397727 C-0.0162631579,0.611738636 -0.000473684211,0.507147727 0.0423157895,0.417477273 C0.0849473684,0.327806818 0.162157895,0.252909091 0.274105263,0.193079545 C0.386052632,0.13325 0.535105263,0.091 0.721578947,0.0660340909 C0.907894737,0.0412159091 1.15026316,0.0286590909 1.44884211,0.0286590909 C1.73636842,0.0286590909 1.97352632,0.0437272727 2.16031579,0.0734204545 C2.34663158,0.103409091 2.49584211,0.148318182 2.60778947,0.208147727 C2.71942105,0.267977273 2.79663158,0.340363636 2.83957895,0.425011364 C2.88189474,0.509806818 2.90336842,0.611886364 2.90336842,0.731545455 L2.63178947,9.13309091 L2.63178947,9.13309091 Z" id="Shape"></path>
<path d="M2.95926316,11.6175682 C2.95926316,12.2966705 2.28173684,12.8463636 1.44757895,12.8463636 C1.24910526,12.8463636 1.06105263,12.8154886 0.887210526,12.7590568 C0.644842105,12.8831477 0.429157895,12.9677955 0.140368421,13.0208295 C0.0541578947,13.037375 0.0198947368,13.03575 0.0123157895,13.0257045 C0.00378947368,13.0138864 0.0320526316,12.9908409 0.0571578947,12.9719318 C0.336789474,12.7677727 0.383526316,12.6608182 0.451105263,12.5410114 C0.135,12.3169091 -0.0644210526,11.986 -0.0644210526,11.6174205 C-0.0644210526,10.9383182 0.612,10.3877386 1.44757895,10.3877386 C2.28173684,10.3877386 2.95926316,10.9384659 2.95926316,11.6175682 L2.95926316,11.6175682 Z" id="Shape"></path>
</g>
<g id="icon_29008" transform="translate(75.000000, 114.000000)" fill="#808080" sketch:type="MSShapeGroup">
<ellipse id="Oval" cx="1.96715789" cy="12.1975467" rx="1.96715789" ry="1.74421333"></ellipse>
<ellipse id="Oval" cx="1.96715789" cy="6.97088" rx="1.96715789" ry="1.74421333"></ellipse>
<ellipse id="Oval" cx="1.96715789" cy="1.74421333" rx="1.96715789" ry="1.74421333"></ellipse>
</g>
<g id="icon_29008-2" transform="translate(75.000000, 128.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
<ellipse id="Oval" cx="1.96715789" cy="12.1975467" rx="1.96715789" ry="1.74421333"></ellipse>
<ellipse id="Oval" cx="1.96715789" cy="6.97088" rx="1.96715789" ry="1.74421333"></ellipse>
<ellipse id="Oval" cx="1.96715789" cy="1.74421333" rx="1.96715789" ry="1.74421333"></ellipse>
</g>
<g id="icon_29008-2" transform="translate(103.000000, 2.000000)" fill="#F0FAFF" sketch:type="MSShapeGroup">
<ellipse id="Oval" cx="2.95073684" cy="17.4250667" rx="2.95073684" ry="2.49173333"></ellipse>
<ellipse id="Oval" cx="2.95073684" cy="9.9584" rx="2.95073684" ry="2.49173333"></ellipse>
<ellipse id="Oval" cx="2.95073684" cy="2.49173333" rx="2.95073684" ry="2.49173333"></ellipse>
</g>
</g>
</g>
</g>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 65 KiB

2
app/assets/javascripts/app/controllers/_default_navbar.js.coffee
View file

@ -14,4 +14,4 @@ App.Config.set( 'User', {
App.Config.set( 'Admin', { prio: 9000, parent: '', name: 'Admin', target: '#manage', role: ['Admin'] }, 'NavBarRight' )
App.Config.set( 'New', { prio: 20000, parent: '', name: 'New', target: '#new', class: 'add' }, 'NavBarRight' )
App.Config.set( 'Misc', { prio: 90000, parent: '', name: 'Tools', target: '#tools', child: true }, 'NavBar' )
App.Config.set( 'Misc', { prio: 90000, parent: '', name: 'Tools', target: '#tools', child: true, class: 'tools' }, 'NavBar' )

4
app/assets/javascripts/app/models/ticket.js.coffee
View file

@ -35,5 +35,5 @@ class App.Ticket extends App.Model
iconActivity: (user) ->
if @owner_id == user.id
return 'user'
'group'
return 'important'
''

4
app/assets/javascripts/app/models/ticket_article.js.coffee
View file

@ -36,5 +36,5 @@ class App.TicketArticle extends App.Model
iconActivity: (user) ->
ticket = App.Ticket.find(@ticket_id)
if ticket.owner_id == user.id
return 'user'
'group'
return 'important'
''

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

@ -12,7 +12,7 @@
<ul class="nav navbar-nav">
<% for item in @navbar_left: %>
<% if item.child: %>
<li class="dropdown <% if @open_tab[item.target] : %>open<% end %>">
<li class="dropdown <%= item.class %> <% if @open_tab[item.target] : %>open<% end %>">
<a href="<%= item.target %>" class="dropdown-toggle" data-toggle="dropdown"><%- @T( item.name ) %> <b class="caret"></b></a>
<ul class="dropdown-menu">
<% for item in item.child: %>

33
app/assets/stylesheets/zzz.css.erb
View file

@ -971,6 +971,25 @@ ol.tabs li {
background-position: -42px -128px;
}
.important.icon {
height: 13px;
width: 14px;
background-position: -56px -115px;
}
.icon-switch:hover .important.icon,
.task.active .important.icon {
background-position: -56px -128px;
}
.tools.icon {
height: 13px;
width: 14px;
background-position: -70px -115px;
}
.icon-switch:hover .tools.icon,
.task.active .tools.icon {
background-position: -70px -128px;
}
.channel.icon {
width: 17px;
@ -1284,6 +1303,10 @@ footer {
margin-bottom: 5px;
}
.clickable {
cursor: pointer;
}
.customer_info {
}
@ -1549,6 +1572,8 @@ footer {
li.dashboard a:before,
li.overviews a:before,
li.message a:before,
li.tools a:before,
li.customers a:before {
content: '';
width: 24px;
@ -1568,6 +1593,14 @@ footer {
background-position: -48px 0;
}
li.message a:before {
background-position: -72px 0;
}
li.tools a:before {
background-position: -96px 0;
}
.tasks {
background: #2c2d36;
overflow: auto;