From 36d3c32d2489a2b1aa15cfef91d18399ff4922f8 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 9 Dec 2014 11:12:51 +0100 Subject: [PATCH 1/3] fix firefox flex bug in ticket zoom --- .../javascripts/app/views/ticket_zoom.jst.eco | 98 +++++++++---------- app/assets/stylesheets/zammad.css.scss | 12 ++- 2 files changed, 59 insertions(+), 51 deletions(-) diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco index b66fe5fe6..9d5580fd7 100644 --- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco @@ -1,58 +1,56 @@ -
-
-
-
-
- <%- @C('ticket_hook') %> <%- @ticket.number %> -
-
- 1/36 -
- +
+
+
+
+ <%- @C('ticket_hook') %> <%- @ticket.number %> +
+
+ 1/36 +
+ +
+ -
-
+
+ +
+ +
+
+
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 6f6e894be..cf079ee00 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -3442,6 +3442,8 @@ footer { .tabsSidebar-holder { overflow: hidden; position: relative; + @extend .flex; + @extend .vertical; } .tabsSidebar .sidebar { @@ -3500,7 +3502,7 @@ footer { position: absolute; right: 0; top: 0; - bottom: 0; + bottom: 60px; transition: 500ms; } @@ -4799,6 +4801,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; From 74e8cb5eae1f06bfc4cb408221a2adc65c70852e Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 9 Dec 2014 11:25:45 +0100 Subject: [PATCH 2/3] fix scrollPageHeader zIndex to be behind modals --- app/assets/javascripts/app/views/ticket_zoom.jst.eco | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco index 9d5580fd7..19fa1c7de 100644 --- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco @@ -1,7 +1,7 @@
-
Date: Tue, 9 Dec 2014 11:26:16 +0100 Subject: [PATCH 3/3] remove pointer events on the invisible tabsSidebar so that it doesn't block the scrollbar --- app/assets/stylesheets/zammad.css.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index cf079ee00..f2f22a426 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -3516,6 +3516,7 @@ footer { left: -55px; top: 0; bottom: 0; + pointer-events: none; } .test {