fix priority icons and text color

This commit is contained in:
Felix Niklas 2015-05-27 16:55:08 +02:00
parent 5f015f6249
commit e7cde54890
8 changed files with 38 additions and 28 deletions

View file

@ -158,6 +158,8 @@ class App.ControllerTable extends App.Controller
headerFound = true
header.push attribute
console.log(header)
# execute header callback
if data.callbackHeader
header = data.callbackHeader(header)

View file

@ -169,7 +169,7 @@ class App.Navigation extends App.Controller
id: ticket.id
class: "level-1 ticket-popover"
url: ticket.uiUrl()
iconClass: ticket.icon()
iconClass: "priority"
area.result.push data
else if area.name is 'User'
area.result = []

View file

@ -17,8 +17,8 @@ class App.Organization extends App.Model
uiUrl: ->
'#organization/profile/' + @id
icon: (user) ->
"organization"
icon: ->
'<svg class="icon-organization"><use xlink:href="#icon-organization" /></svg>'
@_fillUp: (data) ->

View file

@ -28,7 +28,7 @@ class App.Ticket extends App.Model
uiUrl: ->
'#ticket/zoom/' + @id
level: (user) ->
level: ->
state = App.TicketState.find( @state_id )
stateType = App.TicketStateType.find( state.state_type_id )
level = 1
@ -38,13 +38,13 @@ class App.Ticket extends App.Model
level = 3
level
icon: (user) ->
"priority"
icon: ->
"icon-priority level-#{ @level() }"
iconTitle: (user) ->
iconTitle: ->
App.TicketState.find( @state_id ).displayName()
iconTextClass: (user) ->
iconTextClass: ->
"level-#{ @level() }"
iconActivity: (user) ->

View file

@ -33,8 +33,8 @@ class App.User extends App.Model
uiUrl: ->
'#user/profile/' + @id
icon: (user) ->
"user"
icon: ->
'<svg class="icon-user"><use xlink:href="#icon-user" /></svg>'
initials: ->
if @firstname && @lastname && @firstname[0] && @lastname[0]

View file

@ -37,7 +37,7 @@
<% end %>
<% end %>
<% position++ %>
<tr class="item <% if object.active is false: %>not-active<% end %>" data-id="<%= object.id %>" data-position="<%= position %>" >
<tr class="item<% if object.active is false: %> is-inactive<% end %>" data-id="<%= object.id %>" data-position="<%= position %>" >
<% if @checkbox: %>
<td class="no-padding">
<label class="input-replacement">
@ -72,11 +72,19 @@
<% end %>
<td <% if item.parentClass: %>class="<%= item.parentClass %>"<% end %>>
<% if item.name is 'icon': %>
<%- item.class %>
<% else: %>
<% if item.link: %>
<a href="<%- item.link %>" <% if item.target: %>target="<%= item.target %>"<% end %>>
<% end %>
<span <% if item.class: %>class="<%= item.class %>"<% end %> <% if item.title: %>title="<%= item.title %>"<% end %> <% if item.data: %><% for data_key, data_item of item.data: %>data-<%- data_key %>="<%= data_item %>" <% end %><% end %>>
<%- value %>
</span>
<% if item.link: %><a href="<%- item.link %>" <% if item.target: %>target="<%= item.target %>"<% end %>><% end %>
<span <% if item.class: %>class="<%= item.class %>"<% end %> <% if item.title: %>title="<%= item.title %>"<% end %> <% if item.data: %><% for data_key, data_item of item.data: %>data-<%- data_key %>="<%= data_item %>" <% end %><% end %>><%- value %></span>
<% if item.link: %></a><% end %>
<% end %>
</td>
<% end %>
<% if @destroy: %>

View file

@ -918,16 +918,6 @@ a {
color: #337ab7;
text-decoration: none;
}
a:hover,
a:focus {
color: #23527c;
text-decoration: underline;
}
a:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
figure {
margin: 0;
}

View file

@ -517,6 +517,11 @@ table {
fill: hsl(240,1%,77%);
}
.table .icon-priority {
vertical-align: middle;
margin-top: -3px;
}
.input-replacement {
padding: 0;
margin: 0;
@ -1721,21 +1726,24 @@ footer {
.level-1.is-active {
background-color: #38ae6a;
}
.level-1 .priority-icon {
.level-1 .priority-icon,
.level-1.icon-priority {
fill: #38ae6a;
}
.level-2.is-active {
background-color: #f35910;
}
.level-2 .priority-icon {
.level-2 .priority-icon,
.level-2.icon-priority {
fill: #f35910;
}
.level-3.is-active {
background-color: #faab00;
}
.level-3 .priority-icon {
.level-3 .priority-icon,
.level-3.icon-priority {
fill: #faab00;
}
@ -2182,6 +2190,7 @@ footer {
border-radius: 0;
border: none;
z-index: 1110;
color: hsl(206,7%,28%);
box-shadow: 0 1px 14px rgba(0,8,14,.25);
word-wrap: break-word;
}
@ -2804,6 +2813,7 @@ footer {
}
.article-content {
color: hsl(60,1%,34%);
position: relative;
padding: 0 55px;
}