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

overview: fix fix auto tab width in FF

Browse source
This commit is contained in:
Felix Niklas 2015-11-25 12:22:17 +01:00
parent 66d56ff9e2
commit f2da497901
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/app/controllers/ticket_overview.coffee
View file

@ -78,6 +78,7 @@ class App.TicketOverview extends App.Controller
class Navbar extends App.Controller class Navbar extends App.Controller
elements: elements:
'.js-tabsHolder': 'tabsHolder'
'.js-tabsClone': 'clone' '.js-tabsClone': 'clone'
'.js-tabClone': 'tabClone' '.js-tabClone': 'tabClone'
'.js-tabs': 'tabs' '.js-tabs': 'tabs'
@ -129,9 +130,7 @@ class Navbar extends App.Controller
items: items items: items
isAgent: @isRole('Agent') isAgent: @isRole('Agent')
console.log @el.width(), @clone.width() while @clone.width() > @tabsHolder.width()
while @clone.width() > @el.width()
@tabClone.not('.hide').last().addClass('hide') @tabClone.not('.hide').last().addClass('hide')
@tab.not('.hide').last().addClass('hide') @tab.not('.hide').last().addClass('hide')
@dropdownItem.filter('.hide').last().removeClass('hide') @dropdownItem.filter('.hide').last().removeClass('hide')

2
app/assets/javascripts/app/views/agent_ticket_view/navbar_vertical.jst.eco
View file

@ -1,4 +1,4 @@
<div class="tabsHolder"> <div class="tabsHolder js-tabsHolder">
<div class="tabs tabs--inline tabs--big js-tabs"> <div class="tabs tabs--inline tabs--big js-tabs">
<% if @items: %> <% if @items: %>
<% for item in @items: %> <% for item in @items: %>

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

@ -2461,6 +2461,7 @@ footer {
.tabsHolder { .tabsHolder {
flex: 1; flex: 1;
margin-right: 20px; margin-right: 20px;
min-width: 0; /* Firefox bug fix */
} }
.tabs { .tabs {