paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-12 09:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename subject_box to pm-box/topic-box.

Browse Source 
I'm not crazy about the names pm-box and topic-box, but they
are less confusing now.
This commit is contained in:
Steve Howell
2016-11-05 12:13:36 -07:00
committed by Tim Abbott
parent 43c372bfb6
commit 06fe4bc943
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/topic_list.js
View File

@@ -148,7 +148,7 @@ exports.set_click_handlers = function (callbacks) {
e.stopPropagation(); e.stopPropagation();
}); });
$('#stream_filters').on('click', '.subject_box', function (e) { $('#stream_filters').on('click', '.topic-box', function (e) {
if (e.metaKey || e.ctrlKey) { if (e.metaKey || e.ctrlKey) {
return; return;
} }

6
static/styles/left-sidebar.css
View File

@@ -299,12 +299,14 @@ li.expanded_private_message {
margin-bottom: -5px; margin-bottom: -5px;
} }
.subject_box { .pm-box,
.topic-box {
display: block; display: block;
margin-right: 38px; margin-right: 38px;
} }
.zero-subject-unreads .subject_box { .zero-subject-unreads .pm-box,
.zero-subject-unreads .topic-box {
margin-right: 15px; margin-right: 15px;
} }

2
static/templates/sidebar_private_message_list.handlebars
View File

@@ -1,7 +1,7 @@
<ul class='expanded_private_messages' data-name='private'> <ul class='expanded_private_messages' data-name='private'>
{{#each messages}} {{#each messages}}
<li class='{{#if is_zero}}zero-subject-unreads{{/if}} {{#if zoom_out_hide}}zoom-out-hide{{/if}} expanded_private_message' data-name='{{reply_to}}'> <li class='{{#if is_zero}}zero-subject-unreads{{/if}} {{#if zoom_out_hide}}zoom-out-hide{{/if}} expanded_private_message' data-name='{{reply_to}}'>
<span class='subject_box'> <span class='pm-box'>
<a href='{{url}}' class="conversation-partners"> <a href='{{url}}' class="conversation-partners">
{{recipients}} {{recipients}}
</a> </a>

2
static/templates/topic_list_item.handlebars
View File

@@ -1,5 +1,5 @@
<li class='{{#if is_zero}}zero-subject-unreads{{/if}} {{#if is_muted}}muted_topic{{/if}} {{#if zoom_out_hide}} zoom-out-hide{{/if}} topic-list-item' data-name='{{topic_name}}'> <li class='{{#if is_zero}}zero-subject-unreads{{/if}} {{#if is_muted}}muted_topic{{/if}} {{#if zoom_out_hide}} zoom-out-hide{{/if}} topic-list-item' data-name='{{topic_name}}'>
<span class='subject_box'> <span class='topic-box'>
<a href='{{url}}' class="subject-name"> <a href='{{url}}' class="subject-name">
{{topic_name}} {{topic_name}}
</a> </a>