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
This commit is contained in:
Martin Edenhofer 2015-10-07 14:41:14 +02:00
commit 52e7ab2e1c
3 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/controllers/layout_ref.coffee
View file

@ -1779,7 +1779,6 @@ class App.CustomerChatRef extends App.Controller
propagateLayoutChange: (event) =>
# adjust scroll position on layoutChange
console.log "propagateLayoutChange", event
for chat in @chatWindows
chat.trigger 'layout-changed'
@ -1904,7 +1903,7 @@ class chatWindowRef extends Spine.Controller
@lastTimestamp
@lastAddedType
@render()
@sound.window.play()
#@sound.window.play()
@on 'layout-change', @scrollToBottom

35
app/assets/javascripts/app/views/navigation/menu.jst.eco
View file

@ -1,6 +1,7 @@
<% for item in @items: %>
<% if item.child: %>
<a href="<%= item.target %>" class="dropdown-toggle dropdown<%- ' open' if @open_tab[item.target] %>" data-toggle="dropdown">
<div class="dropdown<%- ' open' if @open_tab[item.target] %>">
<a href="<%= item.target %>" class="menu-item js-<%- item.class %>MenuItem dropdown-toggle" data-toggle="dropdown">
<%- @Icon(item.class, 'menu-item-icon') %>
<span class="menu-item-name flex">
<%- @T(item.name) %>
@ -18,22 +19,22 @@
<li class="<% if @active_tab[item.target] : %>active<% end %>"><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge badge--text count"><%= item['count'] %></span><% end %></a></li>
<% end %>
</ul>
</li>
</div>
<% else: %>
<a class="menu-item js-<%- item.class %>MenuItem<%- ' is-active' if @active_tab[item.target] %>" href="<%= item.target %>">
<%- @Icon(item.class, 'menu-item-icon') %>
<span class="menu-item-name">
<%- @T(item.name) %>
</span>
<% if item.counter: %>
<span class="counter badge badge--big"></span>
<% end %>
<% if item.switch: %>
<span class="zammad-switch zammad-switch--dark zammad-switch--small">
<input type="checkbox" id="<%- item.class %>-switch">
<label for="<%- item.class %>-switch"></label>
</span>
<% end %>
</a>
<a class="menu-item js-<%- item.class %>MenuItem<%- ' is-active' if @active_tab[item.target] %>" href="<%= item.target %>">
<%- @Icon(item.class, 'menu-item-icon') %>
<span class="menu-item-name">
<%- @T(item.name) %>
</span>
<% if item.counter: %>
<span class="counter badge badge--big"></span>
<% end %>
<% if item.switch: %>
<span class="zammad-switch zammad-switch--dark zammad-switch--small">
<input type="checkbox" id="<%- item.class %>-switch">
<label for="<%- item.class %>-switch"></label>
</span>
<% end %>
</a>
<% end %>
<% end %>

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

@ -2289,6 +2289,12 @@ footer {
height: 22px;
}
.menu .dropdown-menu {
left: 10px;
right: 15px;
min-width: 0;
}
.menu-item {
padding: 0 15px;
height: 48px;
@ -2297,12 +2303,13 @@ footer {
text-decoration: none;
display: flex;
align-items: center;
cursor: pointer;
&:hover {
background: hsl(230,10%,13%);
border-bottom-color: rgba(240, 250, 255, .08);
}
&.is-active,
&.is-hovered {
background: none;
@ -2325,13 +2332,7 @@ footer {
}
.dropdown-icon {
fill: hsl(206,7%,37%);
}
.dropdown-menu {
left: 10px;
right: 15px;
min-width: 0;
fill: currentColor;
}
}