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

move_modals: Better structure and style stream/topic references.

Browse Source
This commit is contained in:
Karl Stolley
2024-12-18 17:11:20 -06:00
committed by Tim Abbott
parent af209822a4
commit 42f210ee26
3 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
web/src/stream_popover.ts
View File

@@ -5,6 +5,7 @@ import type * as tippy from "tippy.js";
import {z} from "zod";
import render_inline_decorated_stream_name from "../templates/inline_decorated_stream_name.hbs";
import render_inline_stream_or_topic_reference from "../templates/inline_stream_or_topic_reference.hbs";
import render_move_topic_to_stream from "../templates/move_topic_to_stream.hbs";
import render_left_sidebar_stream_actions_popover from "../templates/popovers/left_sidebar/left_sidebar_stream_actions_popover.hbs";
@@ -379,31 +380,40 @@ export async function build_move_topic_to_stream_popover(
let modal_heading;
if (only_topic_edit) {
modal_heading = $t_html(
{defaultMessage: "Rename <z-stream></z-stream> &gt; {topic_name}"},
{defaultMessage: "Rename <z-stream-or-topic></z-stream-or-topic>"},
{
topic_name,
"z-stream": () =>
render_inline_decorated_stream_name({stream, show_colored_icon: true}),
"z-stream-or-topic": () =>
render_inline_stream_or_topic_reference({
topic_name,
stream,
show_colored_icon: true,
}),
},
);
} else {
modal_heading = $t_html(
{defaultMessage: "Move <z-stream></z-stream> &gt; {topic_name}"},
{defaultMessage: "Move <z-stream-or-topic></z-stream-or-topic>"},
{
topic_name,
"z-stream": () =>
render_inline_decorated_stream_name({stream, show_colored_icon: true}),
"z-stream-or-topic": () =>
render_inline_stream_or_topic_reference({
topic_name,
stream,
show_colored_icon: true,
}),
},
);
}
if (message !== undefined) {
modal_heading = $t_html(
{defaultMessage: "Move messages from <z-stream></z-stream> &gt; {topic_name}"},
{defaultMessage: "Move messages from <z-stream-or-topic></z-stream-or-topic>"},
{
topic_name,
"z-stream": () =>
render_inline_decorated_stream_name({stream, show_colored_icon: true}),
"z-stream-or-topic": () =>
render_inline_stream_or_topic_reference({
stream,
topic_name,
show_colored_icon: true,
}),
},
);
// We disable topic input only for modal is opened from the message actions

13
web/styles/modal.css
View File

@@ -57,6 +57,19 @@
}
}
.modal__title:has(.stream-or-topic-reference) {
/* Reduce the font weight of headings that
include stream or topic references (e.g.,
topic move/rename modals). */
font-weight: 450;
.stream-or-topic-reference {
/* Make the stream or topic references
more prominent. */
font-weight: 600;
}
}
.user-profile-name-heading {
max-width: 80%;
display: flex;

7
web/templates/inline_stream_or_topic_reference.hbs Normal file
View File

@@ -0,0 +1,7 @@
<span class="stream-or-topic-reference">
{{~#if stream~}}
{{> inline_decorated_stream_name stream=stream show_colored_icon=show_colored_icon}}
{{#if topic_name~}} &gt; {{/if}}
{{~/if~}}
{{~ topic_name ~}}
</span>