Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display whitespace properly #239

Merged
merged 1 commit into from Apr 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions client/css/style.css
Expand Up @@ -760,6 +760,14 @@ button,
color: #999;
}

#chat .msg.motd .text,
#chat .msg.message .text,
#chat .msg.action .action-text,
#chat .msg.notice .text {
white-space: pre-wrap;
overflow: hidden;
}

#chat.hide-join .join,
#chat.hide-mode .mode,
#chat.hide-motd .motd,
Expand Down
2 changes: 1 addition & 1 deletion client/views/actions/action.tpl
@@ -1,2 +1,2 @@
<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a>
{{{parse text}}}
<span class="action-text">{{{parse text}}}</span>
11 changes: 6 additions & 5 deletions client/views/msg.tpl
Expand Up @@ -7,16 +7,17 @@
<a href="#" class="user" style="color: #{{stringcolor from}}" data-name="{{from}}">{{mode}}{{from}}</a>
{{/if}}
</span>
<span class="text">
{{#equal type "toggle"}}
{{#equal type "toggle"}}
<span class="text">
<div class="force-newline">
<button id="toggle-{{id}}" class="toggle-button">···</button>
</div>
{{#if toggle}}
{{partial "toggle"}}
{{/if}}
{{else}}
{{{parse text}}}
{{/equal}}
</span>
{{else}}
<span class="text">{{{parse text}}}</span>
{{/equal}}
</span>
</div>