From 1c39e8efea59d4828880e9db2db41d916e2c6c25 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 15 Sep 2014 11:20:47 +0200 Subject: [PATCH 1/3] fix ticket zoom time zIndex --- .../javascripts/app/views/ticket_zoom/article_view.jst.eco | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco index 51cbdcda1..c77f0825a 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco @@ -72,6 +72,6 @@ - + <% end %> \ No newline at end of file From 9590fedeb933d089a756c71f3742bc559a9c1d3d Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 15 Sep 2014 12:27:16 +0200 Subject: [PATCH 2/3] make ticket action icons smaller and add set public icon --- app/assets/images/sprite.svg | 13 ++++++------- app/assets/stylesheets/zzz.css.erb | 26 +++++++++++--------------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index cfafff8b1..1eafc1df0 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -1,5 +1,5 @@ - + 1 Created with Sketch (http://www.bohemiancoding.com/sketch) @@ -187,11 +187,10 @@ - - - - - - + + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 249c26f75..95c121ba2 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -1446,39 +1446,35 @@ ol.tabs li { } .split.action.icon { - width: 24px; - height: 20px; + width: 18px; + height: 15px; background-position: 0 -336px; } .reply.action.icon { - width: 19px; - height: 20px; - background-position: -24px -336px; - } - - .internal.action.icon { - width: 16px; - height: 20px; - background-position: -44px -336px; + width: 14px; + height: 15px; + background-position: -18px -336px; } + .internal.action.icon, .public.visibility.icon { width: 11px; height: 15px; - background-position: 0 -356px; + background-position: -32px -336px; } + .public.action.icon, .internal.visibility.icon { width: 11px; height: 15px; - background-position: -11px -356px; + background-position: -43px -336px; } .recipients.icon { width: 15px; height: 12px; - background-position: -22px -359px; + background-position: -54px -336px; } @@ -2782,7 +2778,7 @@ footer { .article-action .icon { margin-right: 10px; - vertical-align: bottom; + vertical-align: top; } .ticket-edit { From 340d758e924f2099094b01002b81e080f58b5a1d Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 15 Sep 2014 12:27:34 +0200 Subject: [PATCH 3/3] add internal-border to ticket items its not that beautiful yet --- .../app/controllers/ticket_zoom.js.coffee | 4 +- .../views/ticket_zoom/article_view.jst.eco | 6 ++- app/assets/stylesheets/zzz.css.erb | 44 ++++++++----------- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 183b3f72a..eb12b7d84 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -883,9 +883,9 @@ class ArticleView extends App.Controller # runntime update if internal - $(e.target).closest('.ticket-article-item').find('.text-bubble').addClass('internal') + $(e.target).closest('.ticket-article-item').addClass('is-internal') else - $(e.target).closest('.ticket-article-item').find('.text-bubble').removeClass('internal') + $(e.target).closest('.ticket-article-item').removeClass('is-internal') show_toogle: (e) -> e.stopPropagation() diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco index c77f0825a..d5f41ad03 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco @@ -1,5 +1,5 @@ <% for article in @articles: %> -
+
@@ -35,7 +35,9 @@
-
<%- article.html %>
+
+
<%- article.html %>
+
diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 95c121ba2..cdee35aa9 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -2605,12 +2605,12 @@ footer { } .bubble-gap { - margin-left: 15px; + margin-left: 15px !important; } .customer.ticket-article-item .bubble-gap { - margin-left: 0; - margin-right: 15px; + margin-left: 0 !important; + margin-right: 15px !important; } .ticket-article-item { @@ -2679,6 +2679,21 @@ footer { color: #96969b; } + .internal-border { + padding: 5px; + border-radius: 8px; + margin: -5px; + } + + .is-internal .internal-border { + background: repeating-linear-gradient(45deg, hsl(18,79%,89%), hsl(18,79%,89%) 5px, hsl(210,17%,98%) 5px, hsl(210,17%,98%) 6px); + background-size: 8px 8px; + } + + .is-internal .bubble-arrow { + display: none; + } + .text-bubble { padding: 10px 20px; white-space: pre-wrap; @@ -2703,16 +2718,6 @@ footer { border-color: hsl(199,44%,85%); } - .ticket-article-item .text-bubble.internal { - background: #f2def2; - border-color: hsl(300,43%,90%); - box-shadow: none; - } - - .customer.ticket-article-item.state--folde-out .text-bubble.internal { - border-color: hsl(300,43%,84%); - } - .bubble-arrow { position: absolute; width: 7px; @@ -2736,7 +2741,7 @@ footer { transform: rotate(-45deg); } - .ticket-article-item .text-bubble.internal .bubble-arrow:after { + .ticket-article-item.is-internal .bubble-arrow:after { background: #f2def2; border: #eed3d7; } @@ -2790,17 +2795,6 @@ footer { background: white; } - .ticket-edit .internal-border { - padding: 5px; - border-radius: 8px; - margin: -5px; - } - - .ticket-edit.is-internal .internal-border { - background: repeating-linear-gradient(45deg, hsl(18,79%,89%), hsl(18,79%,89%) 5px, transparent 5px, transparent 6px); - background-size: 8px 8px; - } - .ticket-edit .avatar { margin-bottom: 3px; }