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 
# Conflicts:
#	app/assets/javascripts/app/views/profile/notification.jst.eco
This commit is contained in:
Martin Edenhofer 2016-02-09 16:46:26 +01:00
commit fe4e656af6
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/app/views/profile/notification.jst.eco
View file

@ -9,10 +9,10 @@
<thead> <thead>
<tr> <tr>
<th> <th>
<th><%- @T('My Tickets') %> <th width="18%" style="text-align: center;"><%- @T('My Tickets') %>
<th><%- @T('Not Assigned') %> * <th width="18%" style="text-align: center;"><%- @T('Not Assigned') %>*
<th><%- @T('All Tickets') %> * <th width="18%" style="text-align: center;"><%- @T('All Tickets') %>*
<th class="settings-list-separator"><%- @T('Also notify via email') %> <th width="120px" class="settings-list-separator" style="text-align: center;"><%- @T('Also notify via email') %>
</thead> </thead>
<tbody> <tbody>
<% if @config.matrix: %> <% if @config.matrix: %>

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

@ -431,6 +431,10 @@ pre code.hljs {
} }
} }
&.btn--secondary {
color: hsl(202,68%,54%);
}
&.btn--positive, &.btn--positive,
&.btn--create, &.btn--create,
&.btn--success { &.btn--success {
@ -5564,6 +5568,10 @@ footer {
.dropdown-menu.dropdown-menu--light > li { .dropdown-menu.dropdown-menu--light > li {
color: hsl(202,70%,49%); color: hsl(202,70%,49%);
&.dropdown-header {
color: hsl(198,19%,72%);
}
} }
.dropdown-menu.dropdown-menu--light > li > a:hover { .dropdown-menu.dropdown-menu--light > li > a:hover {
@ -5680,8 +5688,8 @@ footer {
} }
li.dropdown-header { li.dropdown-header {
line-height: 36px; line-height: 34px;
height: 32px; height: 30px;
} }
.recipientList, .recipientList,