From f2da497901c3cf945cf0242a5673f0fb0643e3b8 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 25 Nov 2015 12:22:17 +0100 Subject: [PATCH] overview: fix fix auto tab width in FF --- .../javascripts/app/controllers/ticket_overview.coffee | 5 ++--- .../app/views/agent_ticket_view/navbar_vertical.jst.eco | 2 +- app/assets/stylesheets/zammad.scss | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_overview.coffee b/app/assets/javascripts/app/controllers/ticket_overview.coffee index 47f68bb59..10e5eaac2 100644 --- a/app/assets/javascripts/app/controllers/ticket_overview.coffee +++ b/app/assets/javascripts/app/controllers/ticket_overview.coffee @@ -78,6 +78,7 @@ class App.TicketOverview extends App.Controller class Navbar extends App.Controller elements: + '.js-tabsHolder': 'tabsHolder' '.js-tabsClone': 'clone' '.js-tabClone': 'tabClone' '.js-tabs': 'tabs' @@ -129,9 +130,7 @@ class Navbar extends App.Controller items: items isAgent: @isRole('Agent') - console.log @el.width(), @clone.width() - - while @clone.width() > @el.width() + while @clone.width() > @tabsHolder.width() @tabClone.not('.hide').last().addClass('hide') @tab.not('.hide').last().addClass('hide') @dropdownItem.filter('.hide').last().removeClass('hide') diff --git a/app/assets/javascripts/app/views/agent_ticket_view/navbar_vertical.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/navbar_vertical.jst.eco index 8ad46466d..c005f1001 100644 --- a/app/assets/javascripts/app/views/agent_ticket_view/navbar_vertical.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_view/navbar_vertical.jst.eco @@ -1,4 +1,4 @@ -
+
<% if @items: %> <% for item in @items: %> diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 2f8890c23..e0e8e7479 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -2461,6 +2461,7 @@ footer { .tabsHolder { flex: 1; margin-right: 20px; + min-width: 0; /* Firefox bug fix */ } .tabs {