Merge pull request #2593 from MaxLeiter/fix-x-button-text

Switch close button text on channels to Leave and kept as Close for other types.
This commit is contained in:
Jérémie Astori 2018-06-27 00:37:59 -04:00 committed by GitHub
commit 51f5cda4ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -25,14 +25,19 @@
<span class="add-channel-tooltip tooltipped tooltipped-w tooltipped-no-touch" aria-label="Join a channel…" data-alt-label="Cancel"> <span class="add-channel-tooltip tooltipped tooltipped-w tooltipped-no-touch" aria-label="Join a channel…" data-alt-label="Cancel">
<button class="add-channel" aria-label="Join a channel…" aria-controls="join-channel-{{id}}"></button> <button class="add-channel" aria-label="Join a channel…" aria-controls="join-channel-{{id}}"></button>
</span> </span>
{{/equal}} {{else}}
{{#notEqual type "lobby"}}
<span class="name" title="{{name}}">{{name}}</span> <span class="name" title="{{name}}">{{name}}</span>
<span class="badge{{#if highlight}} highlight{{/if}}" data-highlight="{{highlight}}">{{#if unread}}{{roundBadgeNumber unread}}{{/if}}</span> <span class="badge{{#if highlight}} highlight{{/if}}" data-highlight="{{highlight}}">{{#if unread}}{{roundBadgeNumber unread}}{{/if}}</span>
<span class="close-tooltip tooltipped tooltipped-w" aria-label="Leave"> {{#equal type "channel"}}
<button class="close" aria-label="Leave"></button> <span class="close-tooltip tooltipped tooltipped-w" aria-label="Leave">
</span> <button class="close" aria-label="Leave"></button>
{{/notEqual}} </span>
{{else}}
<span class="close-tooltip tooltipped tooltipped-w" aria-label="Close">
<button class="close" aria-label="Close"></button>
</span>
{{/equal}}
{{/equal}}
</div> </div>
{{#equal type "lobby"}} {{#equal type "lobby"}}
{{> join_channel}} {{> join_channel}}