From fdf465938f7776bb95d2a33e54032dd7a80c4bbb Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 14 Dec 2015 16:07:48 +0100 Subject: [PATCH 1/6] update dev autostart script --- .../Contents/Resources/Scripts/main.scpt | Bin 5214 -> 5214 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/contrib/mac_developer_scripts.app/Contents/Resources/Scripts/main.scpt b/contrib/mac_developer_scripts.app/Contents/Resources/Scripts/main.scpt index 1b2b11046141b69e0972d89c86f7f3c0d7c5f183..343ced05ce9dd5f9cf7ce0205d343503a2044037 100644 GIT binary patch delta 137 zcmcboaZh8zM`o`2FWFpfnRzLxMU(CMEjbvPrg>fB7n(G=j$eLq47a@4CBAP(3=9m6 z3_J`#r9hko#F?8Xuq3fD0|h33<#J?iW?yvi-@mU=JzCtz3MX{@37`T*ogzIfh$7^gs6t1_lO3 z1|A@30mSA&Y_@p From 51dff37024c241286e28fb23eb020eb0b21fe4f6 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 14 Dec 2015 16:08:08 +0100 Subject: [PATCH 2/6] page-header-meta: keep inline, shrink buttons --- app/assets/stylesheets/zammad.scss | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 493c25ebb..580dfac59 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -1827,8 +1827,15 @@ kbd { .page-header-meta { margin-left: auto; - padding-left: 9px; + padding-left: 20px; display: flex; + flex: 1; + + .btn { + overflow: hidden; + text-overflow: hidden; + white-space: nowrap; + } .btn + .btn { margin-left: 9px; From d11f05881adfabc059d579c2c6231eb1dac8784c Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 14 Dec 2015 16:12:33 +0100 Subject: [PATCH 3/6] page-header-meta: shrink - firefox fix --- app/assets/stylesheets/zammad.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 580dfac59..d1a444236 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -1829,11 +1829,13 @@ kbd { margin-left: auto; padding-left: 20px; display: flex; + justify-content: flex-end; flex: 1; + min-width: 0; /* firefox flexbug */ .btn { overflow: hidden; - text-overflow: hidden; + text-overflow: ellipsis; white-space: nowrap; } From 5ae7f06225157948c40608a889d8a38775fd5085 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 14 Dec 2015 16:15:54 +0100 Subject: [PATCH 4/6] chat channel: inline on/off button --- .../javascripts/app/views/channel/chat.jst.eco | 14 +++++--------- app/assets/stylesheets/zammad.scss | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/app/views/channel/chat.jst.eco b/app/assets/javascripts/app/views/channel/chat.jst.eco index 865f2fc44..4c4658a4e 100644 --- a/app/assets/javascripts/app/views/channel/chat.jst.eco +++ b/app/assets/javascripts/app/views/channel/chat.jst.eco @@ -1,19 +1,15 @@
-

<%- @T('Chat') %>

+
+ checked<% end %>> + +
+

<%- @T('Chat') %>

<%- @T('You can create chat widgets for your webpages to allow visitors to chat with you.') %>

-

<%- @T('Enable') %>/<%- @T('Disable') %>

-
-
- checked<% end %>> - -
-
-

<%- @T('Topics') %>

<%- @T('You can create multiple chat topics.') %>

diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index d1a444236..ec4c480e5 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -1809,10 +1809,19 @@ kbd { justify-content: center; } -.page-header-title h1, -.page-header-title h2 { - margin-top: 9px; - margin-bottom: 7px; +.page-header-title { + display: flex; + align-items: center; + + .zammad-switch { + margin-right: 9px; + } + + h1, + h2 { + margin-top: 9px; + margin-bottom: 7px; + } } .page-header-center { From 8826b8c371ba4529f5d684962518d8748efd14a1 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 14 Dec 2015 16:25:06 +0100 Subject: [PATCH 5/6] ticket zoom: full click area for textarea --- .../app/controllers/ticket_zoom/article_new.coffee | 12 ++++++++---- app/assets/stylesheets/zammad.scss | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee index 9ccba0fd3..07c646118 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee @@ -18,8 +18,8 @@ class App.TicketZoomArticleNew extends App.Controller 'click .js-articleTypeItem': 'selectArticleType' 'click .js-selectedArticleType': 'showSelectableArticleType' 'click .js-mail-inputs': 'stopPropagation' - 'click .js-writeArea': 'stopPropagation' - 'click .list-entry-type div': 'change_type' + 'click .js-writeArea': 'propagateOpenTextarea' + 'click .list-entry-type div': 'changeType' 'focus .js-textarea': 'openTextarea' constructor: -> @@ -217,9 +217,8 @@ class App.TicketZoomArticleNew extends App.Controller ) @subscribeIdTextModule = ticket.subscribe( callback ) - change_type: (e) -> + changeType: (e) -> $(e.target).addClass('active').siblings('.active').removeClass('active') - # store $(this).data('value') toggleVisibility: (event) -> event.stopPropagation() @@ -309,7 +308,12 @@ class App.TicketZoomArticleNew extends App.Controller scrollToBottom: -> @el.scrollParent().scrollTop @el.scrollParent().prop('scrollHeight') + propagateOpenTextarea: (event) -> + event.stopPropagation() + @textarea.focus() + openTextarea: (event, withoutAnimation) => + event.stopPropagation() if @articleNewEdit.hasClass('is-open') return diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index ec4c480e5..eb8ff996c 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -4588,6 +4588,7 @@ footer { border-radius: 5px; padding-left: 12px; padding-right: 12px; + cursor: text; } .article-new .textBubble [contenteditable], From e5da43f170b9346c032f912603179432a455fc2a Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 14 Dec 2015 17:03:02 +0100 Subject: [PATCH 6/6] fix checkboxes when zoomed out in browser --- app/assets/stylesheets/zammad.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index eb8ff996c..d19881ac3 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -920,6 +920,7 @@ th.align-right { .table .checkbox-replacement, .table .radio-replacement { height: 40px; + width: 40px; } .table-overview tbody .icon-checkbox,