Merge branch 'develop' of github.com:martini/zammad into develop
This commit is contained in:
commit
89781db7c6
2 changed files with 60 additions and 51 deletions
|
@ -1,8 +1,7 @@
|
|||
<div class="tabsSidebar-holder flex vertical">
|
||||
<div class="flex u-positionOrigin horizontal">
|
||||
<div class="tabsSidebar-holder">
|
||||
<div class="main no-padding flex tabsSidebar-sidebarSpacer tabsSidebar-tabsSpacer">
|
||||
<div class="ticketZoom">
|
||||
<div class="scrollPageHeader tabsSidebar-sidebarSpacer zIndex-9 horizontal center"
|
||||
<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);"
|
||||
|
@ -51,7 +50,6 @@
|
|||
</div>
|
||||
|
||||
<div class="tabsSidebar vertical"></div>
|
||||
</div>
|
||||
|
||||
<div class="attributeBar">
|
||||
<form class="form-inline is-closed hide" role="form">
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue