From 59761d1e2fe82398e99c8f854f374435393592f8 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 23 Nov 2015 14:42:00 +0100 Subject: [PATCH] chat designer: more explicit + add channel label --- app/assets/javascripts/app/views/channel/chat.jst.eco | 6 +++--- app/assets/stylesheets/zammad.scss | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/app/views/channel/chat.jst.eco b/app/assets/javascripts/app/views/channel/chat.jst.eco index d41a07cfe..d21f76102 100644 --- a/app/assets/javascripts/app/views/channel/chat.jst.eco +++ b/app/assets/javascripts/app/views/channel/chat.jst.eco @@ -41,7 +41,7 @@ <% end %> - <%- @Icon('plus-small') %> + <%- @Icon('plus-small') %> Add Channel @@ -172,7 +172,7 @@

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

-

<%- @T('Insert the widget-code into the source code of every page the chat should be visible on. It should be placed at the end of the page source code before the `</body>` closing tag.') %>

+

<%- marked(@T('Insert the widget-code into the source code of every page the chat should be visible on. It should be placed at the end of the page source code before the `` closing tag.')) %>

Requirements

<%- @T("Zammad Chat requires jQuery. If you don't already use it on your website include it like this:") %>

@@ -213,7 +213,7 @@ $(function() {
  • <%- @T('The chat is turned off.') %>
  • <%- @T('There are too many people in queue for the chat.') %> - <%- marked(@T('When you turn on debubbing by setting the option `debug` to `true` the reason gets printed to the javascript console.')) %> + <%- marked(@T('When you turn on debugging by setting the option `debug` to `true` the reason gets printed to the javascript console.')) %>

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

    diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 1efbaee47..e5a9bceb5 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -6707,18 +6707,20 @@ output { .settings-list-action-cell { @extend .u-clickable; text-align: center; + color: hsl(198,19%,72%); background: hsl(197,22%,96%); line-height: 1; + padding-top: 11px; + padding-bottom: 9px; &:hover { - .icon { - fill: hsl(60,1%,34%); - } + color: hsl(60,1%,34%); } .icon { - fill: hsl(198,19%,72%); + fill: currentColor; vertical-align: top; + margin-top: -2px; } }