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

style escalation labels

Browse source
This commit is contained in:
Felix Niklas 2015-09-30 15:28:26 +02:00
parent 197b8a2b93
commit acacee59e2
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/lib/app_post/pretty_date.coffee
View file

@ -15,8 +15,6 @@ class App.PrettyDate
style = 'class="label label-danger"' style = 'class="label label-danger"'
else if diff > -60 * 60 else if diff > -60 * 60
style = 'class="label label-warning"' style = 'class="label label-warning"'
else
style = 'class="label label-success"'
# remember past/future # remember past/future
direction = 'future' direction = 'future'

17
app/assets/stylesheets/zammad.scss
View file

@ -840,7 +840,9 @@ label,
} }
/* circumventing the label:not(.inline-label) selector because it's too strong */ /* circumventing the label:not(.inline-label) selector because it's too strong */
.inline-label { .inline-label,
.label.label-warning,
.label.label-danger {
font-size: inherit; font-size: inherit;
font-weight: inherit; font-weight: inherit;
text-align: inherit; text-align: inherit;
@ -857,6 +859,19 @@ label,
cursor: pointer; cursor: pointer;
} }
.label.label-warning,
.label.label-danger {
background: none;
}
.label.label-warning {
color: $ok-color;
}
.label.label-danger {
color: $superbad-color;
}
fieldset { fieldset {
margin: 0 -4px; margin: 0 -4px;
@extend .clearfix; @extend .clearfix;