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

app/assets/javascripts/app/views/ticket_zoom.jst.eco

@@ -1,58 +1,56 @@
-<div class="tabsSidebar-holder flex vertical">
-  <div class="flex u-positionOrigin horizontal">
-    <div class="main no-padding flex tabsSidebar-sidebarSpacer tabsSidebar-tabsSpacer">
-      <div class="ticketZoom">
-        <div class="scrollPageHeader tabsSidebar-sidebarSpacer zIndex-9 horizontal center"
-          data-anchor-target=".ticketZoom .page-header"
-          data-128-top-bottom="transform: translateY(-64px);"
-          data-64-top-bottom="transform: translateY(0px);"
-        >
-          <small><%- @C('ticket_hook') %> <span class="ticket-number"><%- @ticket.number %></span></small>
-          <div class="ticket-title flex"></div>
-          <div class="pagination-counter">
-            <span class="pagination-item-current">1</span>/<span class="pagination-total-items">36</span>
-          </div>
-          <ul class="pagination">
-            <li>
-              <a class="centered" href="#" data-from="<%= @items_from - @items_per_page %>" data-type="page">
-                <span class="left arrow icon"></span>
-              </a>
-            <li>
-              <a class="centered" href="#" data-from="<%= @items_from + @items_per_page %>" data-type="page">
-                <span class="right arrow icon"></span>
-              </a>
-          </ul>
+<div class="tabsSidebar-holder">
+  <div class="main no-padding flex tabsSidebar-sidebarSpacer tabsSidebar-tabsSpacer">
+    <div class="ticketZoom">
+      <div class="scrollPageHeader tabsSidebar-sidebarSpacer zIndex-3 horizontal center"
+        data-anchor-target=".ticketZoom .page-header"
+        data-128-top-bottom="transform: translateY(-64px);"
+        data-64-top-bottom="transform: translateY(0px);"
+      >
+        <small><%- @C('ticket_hook') %> <span class="ticket-number"><%- @ticket.number %></span></small>
+        <div class="ticket-title flex"></div>
+        <div class="pagination-counter">
+          <span class="pagination-item-current">1</span>/<span class="pagination-total-items">36</span>
+        </div>
+        <ul class="pagination">
+          <li>
+            <a class="centered" href="#" data-from="<%= @items_from - @items_per_page %>" data-type="page">
+              <span class="left arrow icon"></span>
+            </a>
+          <li>
+            <a class="centered" href="#" data-from="<%= @items_from + @items_per_page %>" data-type="page">
+              <span class="right arrow icon"></span>
+            </a>
+        </ul>
+      </div>
+      <div class="page-header horizontal">
+        <div class="flex vertical center">
+          <%- @ticket.customer.avatar("50") %>
+          <div class="ticket-title"></div>
+          <div class="ticket-meta"></div>
+        </div>
+        <div class="page-header-meta">
+          <% if @C( 'LastOverview' ) && @nav: %>
+            <div class="pull-right">
+              <span class="pagination-count"><%= @C( 'LastOverviewPosition' ) %>/<%= @C( 'LastOverviewTotal' ) %></span>
+              <% base_url ="#ticket/view/#{ @C('LastOverview') }/#{ @C('LastOverviewPosition') }/" %>
+              <ul class="pagination pagination-sm">
+                <li class="<% if @C('LastOverviewPosition') <= 1: %>disabled<% end %>"><a href="<%- base_url %>previous" title="<%- @Ti( 'previous Ticket in Overview' ) %>">«</a></li>
+                <li class="<% if @C('LastOverviewPosition') is @C('LastOverviewTotal'): %>disabled<% end %>"><a href="<%- base_url %>next" title="<%- @Ti( 'next Ticket in Overview' ) %>">»</a></li>
+              </ul>
+            </div>
+          <% end %>
         </div>
-        <div class="page-header horizontal">
-          <div class="flex vertical center">
-            <%- @ticket.customer.avatar("50") %>
-            <div class="ticket-title"></div>
-            <div class="ticket-meta"></div>
-          </div>
-          <div class="page-header-meta">
-            <% if @C( 'LastOverview' ) && @nav: %>
-              <div class="pull-right">
-                <span class="pagination-count"><%= @C( 'LastOverviewPosition' ) %>/<%= @C( 'LastOverviewTotal' ) %></span>
-                <% base_url ="#ticket/view/#{ @C('LastOverview') }/#{ @C('LastOverviewPosition') }/" %>
-                <ul class="pagination pagination-sm">
-                  <li class="<% if @C('LastOverviewPosition') <= 1: %>disabled<% end %>"><a href="<%- base_url %>previous" title="<%- @Ti( 'previous Ticket in Overview' ) %>">«</a></li>
-                  <li class="<% if @C('LastOverviewPosition') is @C('LastOverviewTotal'): %>disabled<% end %>"><a href="<%- base_url %>next" title="<%- @Ti( 'next Ticket in Overview' ) %>">»</a></li>
-                </ul>
-              </div>
-            <% end %>
-          </div>
-        </div>
-
-        <div class="ticket-article"></div>
-
-        <div class="ticket-edit"></div>
-
       </div>
-    </div>
 
-    <div class="tabsSidebar vertical"></div>
+      <div class="ticket-article"></div>
+
+      <div class="ticket-edit"></div>
+
+    </div>
   </div>
 
+  <div class="tabsSidebar vertical"></div>
+
   <div class="attributeBar">
     <form class="form-inline is-closed hide" role="form">
       <div class="form-group">

app/assets/stylesheets/zammad.css.scss

@@ -3443,6 +3443,8 @@ footer {
 .tabsSidebar-holder {
   overflow: hidden;
   position: relative;
+  @extend .flex;
+  @extend .vertical;
 }
 
 .tabsSidebar .sidebar {
@@ -3501,7 +3503,7 @@ footer {
     position: absolute;
     right: 0;
     top: 0;
-    bottom: 0;
+    bottom: 60px;
     transition: 500ms;
   }
 
@@ -3515,6 +3517,7 @@ footer {
     left: -55px;
     top: 0;
     bottom: 0;
+    pointer-events: none;
   }
 
   .test {
@@ -4800,6 +4803,14 @@ body.fit {
               flex: 1;
 }
 
+.flex-full {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1 1 100%;
+     -moz-flex: 1 1 100%;
+      -ms-flex: 1 1 100%;
+          flex: 1 1 100%;
+}
+
 .flex-auto {
   -webkit-box-flex: 1;
   -webkit-flex: 1 1 auto;