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

single_message.handlebars: Upgrade to font-awesome 4.7 icon prefixes.

Browse Source
This commit is contained in:
Aditya Bansal
2018-07-04 05:12:24 +05:30
committed by Tim Abbott
parent 37b1100a2c
commit 66096e9509
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/casper_tests/07-stars.js
View File

@@ -2,7 +2,7 @@ var common = require('../casper_lib/common.js').common;
function star_count() { function star_count() {
return casper.evaluate(function () { return casper.evaluate(function () {
return $("#zhome .icon-vector-star:not(.empty-star)").length; return $("#zhome .fa-star:not(.empty-star)").length;
}); });
} }
@@ -40,7 +40,7 @@ casper.then(function () {
}); });
casper.then(function () { casper.then(function () {
casper.waitUntilVisible('#zhome .icon-vector-star', function () { casper.waitUntilVisible('#zhome .fa-star', function () {
casper.test.assertEquals(star_count(), 1, casper.test.assertEquals(star_count(), 1,
"Got expected single star count."); "Got expected single star count.");

4
static/js/ui.js
View File

@@ -86,9 +86,9 @@ exports.update_starred = function (message) {
update_message_in_all_views(message.id, function update_row(row) { update_message_in_all_views(message.id, function update_row(row) {
var elt = row.find(".star"); var elt = row.find(".star");
if (starred) { if (starred) {
elt.addClass("icon-vector-star").removeClass("icon-vector-star-empty").removeClass("empty-star"); elt.addClass("fa-star").removeClass("fa-star-o").removeClass("empty-star");
} else { } else {
elt.removeClass("icon-vector-star").addClass("icon-vector-star-empty").addClass("empty-star"); elt.removeClass("fa-star").addClass("fa-star-o").addClass("empty-star");
} }
var title_state = starred ? i18n.t("Unstar") : i18n.t("Star"); var title_state = starred ? i18n.t("Unstar") : i18n.t("Star");
elt.attr("title", i18n.t("__starred_status__ this message", {starred_status: title_state})); elt.attr("title", i18n.t("__starred_status__ this message", {starred_status: title_state}));

10
static/templates/single_message.handlebars
View File

@@ -45,23 +45,23 @@
<div class="edit_content"></div> <div class="edit_content"></div>
{{else}} {{else}}
<div class="reaction_button"> <div class="reaction_button">
<i class="icon-vector-smile" title="{{#tr this}}Add emoji reaction{{/tr}} (:)"></i> <i class="fa fa-smile-o" aria-hidden="true" title="{{#tr this}}Add emoji reaction{{/tr}} (:)"></i>
</div> </div>
{{/if}} {{/if}}
{{#unless msg/locally_echoed}} {{#unless msg/locally_echoed}}
<div class="info actions_hover"> <div class="info actions_hover">
<i class="icon-vector-chevron-down" title="{{#tr this}}Message actions{{/tr}} (i)"></i> <i class="fa fa-chevron-down" aria-hidden="true" title="{{#tr this}}Message actions{{/tr}} (i)"></i>
</div> </div>
{{/unless}} {{/unless}}
<div class="message_failed {{#unless msg.failed_request}}notvisible{{/unless}}"> <div class="message_failed {{#unless msg.failed_request}}notvisible{{/unless}}">
<i class="icon-vector-refresh refresh-failed-message" data-toggle="tooltip" title="{{t 'Retry' }}"></i> <i class="fa fa-refresh refresh-failed-message" aria-hidden="true" data-toggle="tooltip" title="{{t 'Retry' }}"></i>
<i class="icon-vector-remove-sign remove-failed-message" data-toggle="tooltip" title="{{t 'Cancel' }}"></i> <i class="fa fa-times-circle remove-failed-message" aria-hidden="true" data-toggle="tooltip" title="{{t 'Cancel' }}"></i>
</div> </div>
{{#unless msg/locally_echoed}} {{#unless msg/locally_echoed}}
<div class="star {{#if msg/starred}}icon-vector-star{{else}}icon-vector-star-empty{{/if}} {{#if msg/starred}}{{else}}empty-star{{/if}}" title="{{#tr this.msg}}__starred_status__ this message{{/tr}} (*)"> <div class="star fa {{#if msg/starred}}fa-star{{else}}fa-star-o{{/if}} {{#if msg/starred}}{{else}}empty-star{{/if}}" title="{{#tr this.msg}}__starred_status__ this message{{/tr}} (*)">
</div> </div>
{{/unless}} {{/unless}}