paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

message_edit: Scale resolve topic spinner with font size.

Browse Source 
This commit also changes the width of the spinner so that the
resolve icon and spinner take up the same width.
This commit is contained in:
evykassirer
2025-03-10 15:00:56 -07:00
committed by Tim Abbott
parent e2d9d069e0
commit 0e152a128f
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/message_edit.ts
View File

@@ -735,7 +735,7 @@ export function start($row: JQuery, edit_box_open_callback?: () => void): void {
function show_toggle_resolve_topic_spinner($row: JQuery): void { function show_toggle_resolve_topic_spinner($row: JQuery): void {
const $spinner = $row.find(".toggle_resolve_topic_spinner"); const $spinner = $row.find(".toggle_resolve_topic_spinner");
loading.make_indicator($spinner); loading.make_indicator($spinner);
$spinner.css({width: "18px"}); $spinner.css({width: "1em"});
$row.find(".on_hover_topic_resolve, .on_hover_topic_unresolve").hide(); $row.find(".on_hover_topic_resolve, .on_hover_topic_unresolve").hide();
$row.find(".toggle_resolve_topic_spinner").show(); $row.find(".toggle_resolve_topic_spinner").show();
} }

11
web/styles/zulip.css
View File

@@ -1229,16 +1229,19 @@ nav {
text-align: center; text-align: center;
} }
div.topic_edit_spinner { div.topic_edit_spinner,
div.toggle_resolve_topic_spinner {
display: flex; display: flex;
align-items: center; align-items: center;
width: 1.2em; /* 18px at 15px/em (from font size set in .message-header-contents) */ width: 1.2em; /* 18px at 15px/em (from font size set in .message-header-contents) */
height: 1.2em; /* 18px at 15px/em */ height: 1.2em; /* 18px at 15px/em */
} }
div.toggle_resolve_topic_spinner { .on_hover_topic_unresolve,
margin-top: -12px; .on_hover_topic_resolve {
padding-left: 9px; /* Matches the width set in `show_toggle_resolve_topic_spinner`,
to ensure spinner and resolve icon are the same width */
width: 1em;
} }
div.topic_edit_spinner .loading_indicator_spinner, div.topic_edit_spinner .loading_indicator_spinner,

2
web/templates/recipient_row.hbs
View File

@@ -56,7 +56,7 @@
{{else}} {{else}}
<i class="fa fa-check on_hover_topic_resolve recipient-bar-control recipient_bar_icon hidden-for-spectators" data-topic-name="{{topic}}" data-tippy-content="{{t 'Mark as resolved' }}" role="button" tabindex="0" aria-label="{{t 'Mark as resolved' }}"></i> <i class="fa fa-check on_hover_topic_resolve recipient-bar-control recipient_bar_icon hidden-for-spectators" data-topic-name="{{topic}}" data-tippy-content="{{t 'Mark as resolved' }}" role="button" tabindex="0" aria-label="{{t 'Mark as resolved' }}"></i>
{{/if}} {{/if}}
<div class="toggle_resolve_topic_spinner" style="display: none"></div> <div class="toggle_resolve_topic_spinner recipient_bar_icon" style="display: none"></div>
{{/if}} {{/if}}
{{#if (and is_subscribed (not is_archived))}} {{#if (and is_subscribed (not is_archived))}}