Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

chat designer: more explicit + add channel label

Browse source
This commit is contained in:
Felix Niklas 2015-11-23 14:42:00 +01:00
parent 62bdc30d57
commit 59761d1e2f
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/app/views/channel/chat.jst.eco
View file

@ -41,7 +41,7 @@
<% end %> <% end %>
<tr> <tr>
<td colspan="4" class="settings-list-action-cell js-add"> <td colspan="4" class="settings-list-action-cell js-add">
<%- @Icon('plus-small') %> <%- @Icon('plus-small') %> Add Channel
</tbody> </tbody>
</table> </table>
@ -172,7 +172,7 @@
<h2><%- @T('Usage') %></h2> <h2><%- @T('Usage') %></h2>
<p><%- @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 `&lt;/body&gt;` closing tag.') %></p> <p><%- 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 `</body>` closing tag.')) %></p>
<h3>Requirements</h3> <h3>Requirements</h3>
<p><%- @T("Zammad Chat requires jQuery. If you don't already use it on your website include it like this:") %></p> <p><%- @T("Zammad Chat requires jQuery. If you don't already use it on your website include it like this:") %></p>
@ -213,7 +213,7 @@ $(function() {
<li><%- @T('The chat is turned off.') %> <li><%- @T('The chat is turned off.') %>
<li><%- @T('There are too many people in queue for the chat.') %> <li><%- @T('There are too many people in queue for the chat.') %>
</ol> </ol>
<%- 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.')) %>
</p> </p>
<h3><%- @T('Options') %></h3> <h3><%- @T('Options') %></h3>

10
app/assets/stylesheets/zammad.scss
View file

@ -6707,18 +6707,20 @@ output {
.settings-list-action-cell { .settings-list-action-cell {
@extend .u-clickable; @extend .u-clickable;
text-align: center; text-align: center;
color: hsl(198,19%,72%);
background: hsl(197,22%,96%); background: hsl(197,22%,96%);
line-height: 1; line-height: 1;
padding-top: 11px;
padding-bottom: 9px;
&:hover { &:hover {
.icon { color: hsl(60,1%,34%);
fill: hsl(60,1%,34%);
}
} }
.icon { .icon {
fill: hsl(198,19%,72%); fill: currentColor;
vertical-align: top; vertical-align: top;
margin-top: -2px;
} }
} }