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

This commit is contained in:
Martin Edenhofer 2014-12-16 19:46:39 +01:00
commit 449f0a69c4
3 changed files with 41 additions and 22 deletions

View file

@ -162,23 +162,22 @@ class App.TicketZoom extends App.Controller
@main.unbind('scroll', @positionPageHeaderUpdate) @main.unbind('scroll', @positionPageHeaderUpdate)
positionPageHeaderUpdate: => positionPageHeaderUpdate: =>
pageHeader = @scrollPageHeader.height() headerHeight = @scrollPageHeader.outerHeight()
mainScrollHeigth = @main.prop('scrollHeight') mainScrollHeigth = @main.prop('scrollHeight')
mainHeigth = @main.height() mainHeigth = @main.height()
# if page header is possible to use, show page header # if page header is possible to use, show page header
top = 0 top = 0
if mainScrollHeigth > mainHeigth + pageHeader if mainScrollHeigth > mainHeigth + headerHeight
offset = @ticketZoom.offset() scroll = @main.scrollTop()
if offset.top >= 0 if scroll <= headerHeight
top = offset.top top = (scroll - headerHeight)
# if page header is not possible to use - mainScrollHeigth to low - hide page header # if page header is not possible to use - mainScrollHeigth to low - hide page header
else else
top = pageHeader top = -headerHeight
#console.log('TOP', top, @ticket.id, new Date) @scrollPageHeader.css('transform', "translateY(#{top}px)")
@scrollPageHeader.css('transform', "translateY(-#{top}px)")
render: (force) => render: (force) =>

View file

@ -45,7 +45,7 @@
</div> </div>
</div> </div>
<div class="tabsSidebar vertical"></div> <div class="tabsSidebar tabsSidebar--attributeBarSpacer vertical"></div>
<div class="attributeBar"> <div class="attributeBar">
<form class="form-inline is-closed hide" role="form"> <form class="form-inline is-closed hide" role="form">

View file

@ -308,6 +308,11 @@ span[data-tooltip]:hover:before {
margin-left: auto; margin-left: auto;
} }
.subtle-link.align-right ~ .btn,
.btn.align-right ~ .btn {
margin-left: 15px;
}
.vertical > .btn + .btn { .vertical > .btn + .btn {
margin-left: 0; margin-left: 0;
margin-top: 10px; margin-top: 10px;
@ -665,6 +670,24 @@ textarea,
right: 12px; right: 12px;
top: 50%; top: 50%;
margin-top: -3px; margin-top: -3px;
@extend .u-unclickable;
}
/*
Firefox only hack
-----------------
Firefox doesn't allow us to hide the dropdown arrow
but we want to replace it with our own icon.
So we have to hide our own icon in Firefox.
*/
@-moz-document url-prefix() {
.form-control + .select-arrow {
display: none;
}
} }
select::-ms-expand { select::-ms-expand {
@ -3451,7 +3474,6 @@ footer {
width: 280px; width: 280px;
border-left: 1px solid #e6e6e6; border-left: 1px solid #e6e6e6;
padding: 0; padding: 0;
@extend .vertical;
} }
.tabsSidebar .sidebar > hr { .tabsSidebar .sidebar > hr {
@ -3487,7 +3509,6 @@ footer {
} }
.tabsSidebar .sidebar-content { .tabsSidebar .sidebar-content {
@extend .flex;
padding: 0 20px 20px; padding: 0 20px 20px;
} }
@ -3503,8 +3524,12 @@ footer {
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
bottom: 60px; bottom: 0;
transition: 500ms; transition: 500ms;
&.tabsSidebar--attributeBarSpacer {
bottom: 60px;
}
} }
.tabsSidebar.is-closed { .tabsSidebar.is-closed {
@ -3683,14 +3708,15 @@ footer {
} }
.type-tabs .tab { .type-tabs .tab {
line-height: 40px; line-height: 42px;
padding: 0 8px 0 8px; padding: 0 12px 0 12px;
list-style: none;
} }
.type-tabs .icon { .type-tabs .icon {
vertical-align: top; vertical-align: top;
margin-right: 9px; margin-right: 9px;
margin-top: 10px; margin-top: 11px;
-webkit-transform: scale(1.2); -webkit-transform: scale(1.2);
transform: scale(1.2); transform: scale(1.2);
} }
@ -4949,12 +4975,6 @@ body.fit {
.align-right { .align-right {
margin-left: auto; margin-left: auto;
// give following elements a margin left
// used in setup wizard
& ~ * {
margin-left: 15px;
}
} }
.align-center { .align-center {