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

Merge branch 'interface' of github.com:martini/zammad into interface

Browse source
This commit is contained in:
Martin Edenhofer 2014-07-25 17:20:01 +02:00
commit 7b47ed17f5
3 changed files with 45 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/app/views/agent_ticket_view/navbar.jst.eco
View file

@ -1,7 +1,12 @@
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
<% if @items: %> <% if @items: %>
<% for item in @items: %> <% for item in @items: %>
<li <% if item.active: %>class="active"<% end %>><a href="<%= item.target %>"><span class="local"><%- @T(item.name) %></span><span class="badge pull-right"><%= item.count %></span></a></li> <li <% if item.active: %>class="active"<% end %>>
<a class="horizontal center" href="<%= item.target %>">
<span class="local contain-text"><%- @T(item.name) %></span>
<span class="badge"><%= item.count %></span>
</a>
</li>
<% end %> <% end %>
<% end %> <% end %>
</ul> </ul>

2
app/assets/javascripts/app/views/dashboard/ticket.jst.eco
View file

@ -1,5 +1,5 @@
<div> <div>
<div class="page-header horizontal"> <div class="horizontal">
<div class="page-header-title"> <div class="page-header-title">
<h2 class="can-move"><%- @T( @overview.name ) %> <small><a href="#" data-type="settings" class="glyphicon glyphicon-edit"></a></small></h2> <h2 class="can-move"><%- @T( @overview.name ) %> <small><a href="#" data-type="settings" class="glyphicon glyphicon-edit"></a></small></h2>
</div> </div>

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

@ -576,8 +576,12 @@ label {
margin-bottom: 15px; margin-bottom: 15px;
} }
.page-header-title h2 {
margin-top: 10px;
}
.page-header-meta { .page-header-meta {
margin-top: 18px; margin-top: 5px;
margin-left: auto; margin-left: auto;
} }
@ -990,7 +994,7 @@ ol.tabs li {
} }
.twitter.channel.icon { .twitter.channel.icon {
background-position: -68px -141px; background-position: -67px -141px;
} }
.gray.email.channel.icon { .gray.email.channel.icon {
@ -1913,13 +1917,19 @@ footer {
} }
.sidebar { .sidebar {
width: 270px; width: 32%;
padding: 1px 20px 20px; max-width: 353px;
padding: 20px;
background: white; background: white;
border-right: 1px solid #e6e6e6; border-right: 1px solid #e6e6e6;
overflow: auto; overflow: auto;
} }
.NavBarAdmin.sidebar {
padding-top: 1px;
width: 270px;
}
.nav-stacked > li + li { .nav-stacked > li + li {
margin-top: 0; margin-top: 0;
} }
@ -1961,6 +1971,29 @@ footer {
margin-right: -10px; margin-right: -10px;
} }
.sidebar:not(.NavBarAdmin) .nav-pills > li:first-child > a {
border-top: none;
}
.badge {
padding: 0;
font-size: inherit;
font-weight: normal;
color: #d0d2d3;
background: none;
border-radius: 0;
}
.nav-pills > li > a > .badge {
margin-left: auto;
}
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
color: #96969b;
background: none;
}
.main { .main {
padding: 10px 20px; padding: 10px 20px;
background: #f8f9fa; background: #f8f9fa;
@ -2038,7 +2071,7 @@ footer {
} }
.stat-widgets { .stat-widgets {
margin: 0 -7px; margin: 0 -7px 20px;
} }
.stat-widget { .stat-widget {