From a7669bb5ff971f90e4d07b088df1745e363ecd57 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 10 Jun 2015 12:54:44 +0200 Subject: [PATCH] fix scrollPageHeader width when folding the sidebar --- .../app/views/layout_ref/communication_overview.jst.eco | 2 +- .../javascripts/app/views/layout_ref/highlight.jst.eco | 2 +- app/assets/javascripts/app/views/ticket_zoom.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 8 ++------ 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco index 72444131a..134da4617 100644 --- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco @@ -7,7 +7,7 @@

Ticket Article

-
-
-
+
<%- @C('ticket_hook') %> <%- @ticket.number %>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 226cdeb19..529dd5f5d 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -3598,10 +3598,6 @@ footer { margin-right: 0; } -.tabsSidebar-sidebarSpacer.is-closed .scrollPageHeader { - margin-right: 0; -} - .tabsSidebar-holder { overflow: hidden; position: relative; @@ -4565,7 +4561,7 @@ footer { } .scrollPageHeader { - @extend .zIndex-6; + @extend .zIndex-6, .tabsSidebar-sidebarSpacer; display: flex; align-items: center; background: white; @@ -4573,7 +4569,7 @@ footer { height: 64px; top: 0; left: $navigationWidth; - right: $sidebarWidth; + right: 0; padding: 0 22px; position: fixed; min-width: $minWidth - $navigationWidth - $sidebarWidth;