From 3671a6a39c5e49b402e46ce4d70027c2ba6b82a0 Mon Sep 17 00:00:00 2001 From: Karl Stolley Date: Fri, 18 Apr 2025 09:54:39 -0500 Subject: [PATCH] decorated_channels: Rename privacy-icon class. --- web/src/compose_recipient.ts | 2 +- web/styles/app_components.css | 2 +- web/styles/compose.css | 2 +- web/styles/modal.css | 2 +- web/styles/popovers.css | 4 ++-- web/styles/subscriptions.css | 2 +- web/styles/tooltips.css | 2 +- web/styles/typeahead.css | 2 +- web/styles/zulip.css | 2 +- web/templates/dropdown_list.hbs | 2 +- web/templates/inline_decorated_channel_name.hbs | 8 ++++---- web/templates/input_pill.hbs | 6 +++--- web/tests/stream_pill.test.cjs | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/web/src/compose_recipient.ts b/web/src/compose_recipient.ts index 464565c7d3..5fd05c6ed4 100644 --- a/web/src/compose_recipient.ts +++ b/web/src/compose_recipient.ts @@ -192,7 +192,7 @@ export function update_compose_for_message_type(opts: ComposeTriggeredOptions): // it here. const direct_message_label = $t({defaultMessage: "DM"}); $("#compose_select_recipient_widget .dropdown_widget_value").html( - ` ${direct_message_label}`, + ` ${direct_message_label}`, ); } compose_banner.clear_errors(); diff --git a/web/styles/app_components.css b/web/styles/app_components.css index 7770eff061..7535ab131b 100644 --- a/web/styles/app_components.css +++ b/web/styles/app_components.css @@ -893,7 +893,7 @@ input.settings_text_input { } } -.stream-privacy-type-icon { +.channel-privacy-type-icon { position: relative; top: 0.06rem; padding-right: 1px; diff --git a/web/styles/compose.css b/web/styles/compose.css index 8bc25353ab..7dd4066a11 100644 --- a/web/styles/compose.css +++ b/web/styles/compose.css @@ -1541,7 +1541,7 @@ textarea.new_message_textarea { white-space: nowrap; color: var(--color-text-default); - .stream-privacy-type-icon { + .channel-privacy-type-icon { font-size: 0.9286em; /* 13px at 14px em */ width: 1em; height: 1em; diff --git a/web/styles/modal.css b/web/styles/modal.css index f78e6cfad5..ea357e8faf 100644 --- a/web/styles/modal.css +++ b/web/styles/modal.css @@ -59,7 +59,7 @@ overflow: hidden; word-wrap: break-word; - .stream-privacy-type-icon { + .channel-privacy-type-icon { /* This pushes back on suspect styles in app_components.css. A fuller fix will require tracking down other diff --git a/web/styles/popovers.css b/web/styles/popovers.css index 9df7d7946b..2d7d5f8a01 100644 --- a/web/styles/popovers.css +++ b/web/styles/popovers.css @@ -817,7 +817,7 @@ ul.popover-group-menu-member-list { /* Grid defined in modal.css */ grid-area: heading; - .stream-privacy-type-icon { + .channel-privacy-type-icon { padding-left: 3px; padding-right: 5px; } @@ -841,7 +841,7 @@ ul.popover-group-menu-member-list { white-space: nowrap; color: var(--color-text-default); - .stream-privacy-type-icon { + .channel-privacy-type-icon { /* 13px at 16px/1em */ font-size: 0.8125em; /* 13px at 13px/1em */ diff --git a/web/styles/subscriptions.css b/web/styles/subscriptions.css index 6ec646bd79..87df78cfde 100644 --- a/web/styles/subscriptions.css +++ b/web/styles/subscriptions.css @@ -313,7 +313,7 @@ h4.user_group_setting_subsection_title { line-height: 1.5; display: inline; - .stream-privacy-type-icon { + .channel-privacy-type-icon { margin-right: 4px; } } diff --git a/web/styles/tooltips.css b/web/styles/tooltips.css index 0d20f0b4f7..7084c447f6 100644 --- a/web/styles/tooltips.css +++ b/web/styles/tooltips.css @@ -95,7 +95,7 @@ white-space: nowrap; } - .stream-privacy-type-icon { + .channel-privacy-type-icon { width: 9px; padding-left: 2px; top: 0.5px; diff --git a/web/styles/typeahead.css b/web/styles/typeahead.css index c5b539d1bc..160e4d626e 100644 --- a/web/styles/typeahead.css +++ b/web/styles/typeahead.css @@ -168,7 +168,7 @@ align-items: baseline; font-weight: 500; - .stream-privacy-type-icon { + .channel-privacy-type-icon { margin-right: 3px; } } diff --git a/web/styles/zulip.css b/web/styles/zulip.css index 25b48360fb..5111357d16 100644 --- a/web/styles/zulip.css +++ b/web/styles/zulip.css @@ -2172,7 +2172,7 @@ body:not(.spectator-view) { vertically centered properly. */ line-height: 1.214; - .stream-privacy-type-icon { + .channel-privacy-type-icon { line-height: 1.214; font-size: 0.93em; /* We set only the width so that flexbox diff --git a/web/templates/dropdown_list.hbs b/web/templates/dropdown_list.hbs index 4a6e809242..37f0a55660 100644 --- a/web/templates/dropdown_list.hbs +++ b/web/templates/dropdown_list.hbs @@ -24,7 +24,7 @@ {{#if stream}} {{> inline_decorated_channel_name stream=stream show_colored_icon=true}} {{else if is_direct_message}} - {{name}} + {{name}} {{else if is_setting_disabled}} {{t "Disable" }} {{else}} diff --git a/web/templates/inline_decorated_channel_name.hbs b/web/templates/inline_decorated_channel_name.hbs index 9f943c19ea..e3f24436ea 100644 --- a/web/templates/inline_decorated_channel_name.hbs +++ b/web/templates/inline_decorated_channel_name.hbs @@ -1,10 +1,10 @@ {{! This controls whether the swatch next to streams in the left sidebar has a lock icon. }} {{~#if stream.is_archived ~}} - {{stream.name ~}} + {{stream.name ~}} {{~ else if stream.invite_only ~}} - {{stream.name ~}} + {{stream.name ~}} {{~ else if stream.is_web_public ~}} - {{stream.name ~}} + {{stream.name ~}} {{~ else ~}} - {{stream.name ~}} + {{stream.name ~}} {{~/if~}} diff --git a/web/templates/input_pill.hbs b/web/templates/input_pill.hbs index bdfa1715e4..2652fdb60d 100644 --- a/web/templates/input_pill.hbs +++ b/web/templates/input_pill.hbs @@ -9,11 +9,11 @@ {{#if has_stream}} {{~#if stream.invite_only ~}} - + {{~ else if stream.is_web_public ~}} - + {{~ else ~}} - + {{~/if~}} {{/if}} {{#if is_empty_string_topic}} diff --git a/web/tests/stream_pill.test.cjs b/web/tests/stream_pill.test.cjs index e73e9f64b2..0aefea55a8 100644 --- a/web/tests/stream_pill.test.cjs +++ b/web/tests/stream_pill.test.cjs @@ -154,7 +154,7 @@ run_test("generate_pill_html", () => { "
\n" + ' \n' + ' \n' + - ' Denmark\n' + + ' Denmark\n' + " \n" + '
\n' + ' \n' +