From fd34985344c5c8ff0ec1a4ccc1c35ca455532524 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 16 Dec 2014 15:07:50 +0100 Subject: [PATCH 1/5] fix tabsSidebar height & padding --- app/assets/javascripts/app/views/ticket_zoom.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco index 8f6317670..48ef3d7ff 100644 --- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco @@ -45,7 +45,7 @@ -
+
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 404cd4be5..2e5d841d6 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -3451,7 +3451,6 @@ footer { width: 280px; border-left: 1px solid #e6e6e6; padding: 0; - @extend .vertical; } .tabsSidebar .sidebar > hr { @@ -3487,7 +3486,6 @@ footer { } .tabsSidebar .sidebar-content { - @extend .flex; padding: 0 20px 20px; } @@ -3503,8 +3501,12 @@ footer { position: absolute; right: 0; top: 0; - bottom: 60px; + bottom: 0; transition: 500ms; + + &.tabsSidebar--attributeBarSpacer { + bottom: 60px; + } } .tabsSidebar.is-closed { From 7c135d690e61be0efdab40a44d4182484b18a730 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 16 Dec 2014 15:11:49 +0100 Subject: [PATCH 2/5] QA improvement of tabs with small width --- app/assets/stylesheets/zammad.css.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 2e5d841d6..9335e6f8e 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -3685,14 +3685,14 @@ footer { } .type-tabs .tab { - line-height: 40px; - padding: 0 8px 0 8px; + line-height: 42px; + padding: 0 12px 0 12px; } .type-tabs .icon { vertical-align: top; margin-right: 9px; - margin-top: 10px; + margin-top: 11px; -webkit-transform: scale(1.2); transform: scale(1.2); } From 3793c85a0eb8d38364dafec7367e3923ce2754ab Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 16 Dec 2014 15:20:06 +0100 Subject: [PATCH 3/5] fix Syle of dropdown element in FF29 an later - remove custom dropdown arrow in firefox because it's too complicated to hide the native one (in other browsers its one line of css) - make the dropdown arrow click-through so that one can click it to show the dropdown --- app/assets/stylesheets/zammad.css.scss | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 9335e6f8e..b974ee79e 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -665,6 +665,24 @@ textarea, right: 12px; top: 50%; 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 { @@ -3687,6 +3705,7 @@ footer { .type-tabs .tab { line-height: 42px; padding: 0 12px 0 12px; + list-style: none; } .type-tabs .icon { From 123e628c19146745d78788a403eb5a683e78642a Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 16 Dec 2014 15:35:49 +0100 Subject: [PATCH 4/5] make scrollHeader fully dissapear by using scroll offset of the scroll parent (previously the headers bottom border was still visible because it only scrolled up 62px instead its full height of 64px) --- .../app/controllers/ticket_zoom.js.coffee | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index a2f6415b5..abbfbb4de 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -160,23 +160,22 @@ class App.TicketZoom extends App.Controller @main.unbind('scroll', @positionPageHeaderUpdate) positionPageHeaderUpdate: => - pageHeader = @scrollPageHeader.height() + headerHeight = @scrollPageHeader.outerHeight() mainScrollHeigth = @main.prop('scrollHeight') mainHeigth = @main.height() # if page header is possible to use, show page header top = 0 - if mainScrollHeigth > mainHeigth + pageHeader - offset = @ticketZoom.offset() - if offset.top >= 0 - top = offset.top + if mainScrollHeigth > mainHeigth + headerHeight + scroll = @main.scrollTop() + if scroll <= headerHeight + top = (scroll - headerHeight) # if page header is not possible to use - mainScrollHeigth to low - hide page header else - top = pageHeader - - #console.log('TOP', top, @ticket.id, new Date) - @scrollPageHeader.css('transform', "translateY(-#{top}px)") + top = -headerHeight + + @scrollPageHeader.css('transform', "translateY(#{top}px)") render: (force) => From 20caa7164d5f98aa4e21d132dd3c55fc74e421ca Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 16 Dec 2014 16:54:13 +0100 Subject: [PATCH 5/5] fix alignment bug in user and org profile --- app/assets/stylesheets/zammad.css.scss | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index b974ee79e..21f71f970 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -308,6 +308,11 @@ span[data-tooltip]:hover:before { margin-left: auto; } +.subtle-link.align-right ~ .btn, +.btn.align-right ~ .btn { + margin-left: 15px; +} + .vertical > .btn + .btn { margin-left: 0; margin-top: 10px; @@ -4970,12 +4975,6 @@ body.fit { .align-right { margin-left: auto; - - // give following elements a margin left - // used in setup wizard - & ~ * { - margin-left: 15px; - } } .align-center {