paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

theme: Rename day->light and night->dark in the frontend code.

Browse Source 
This commit standardizes the naming of the day and night themes to light
and dark, respectively. This makes the codebase more consistent with
the naming used in the settings and the user interface.
This commit is contained in:
Sayam Samal
2024-06-20 03:00:39 +05:30
committed by Tim Abbott
parent bc6deb7a0a
commit f49a11c810
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/settings_config.ts
View File

@@ -108,11 +108,11 @@ export const color_scheme_values = {
code: 1, code: 1,
description: $t({defaultMessage: "Automatic (follows system settings)"}), description: $t({defaultMessage: "Automatic (follows system settings)"}),
}, },
day: { light: {
code: 3, code: 3,
description: $t({defaultMessage: "Light"}), description: $t({defaultMessage: "Light"}),
}, },
night: { dark: {
code: 2, code: 2,
description: $t({defaultMessage: "Dark"}), description: $t({defaultMessage: "Dark"}),
}, },

2
web/src/settings_data.ts
View File

@@ -225,7 +225,7 @@ export function should_mask_unread_count(sub_muted: boolean): boolean {
} }
export function using_dark_theme(): boolean { export function using_dark_theme(): boolean {
if (user_settings.color_scheme === settings_config.color_scheme_values.night.code) { if (user_settings.color_scheme === settings_config.color_scheme_values.dark.code) {
return true; return true;
} }

4
web/src/theme.ts
View File

@@ -21,9 +21,9 @@ function set_automatic_theme(): void {
} }
export function set_theme(color_scheme: number): void { export function set_theme(color_scheme: number): void {
if (color_scheme === settings_config.color_scheme_values.night.code) { if (color_scheme === settings_config.color_scheme_values.dark.code) {
set_dark_theme(); set_dark_theme();
} else if (color_scheme === settings_config.color_scheme_values.day.code) { } else if (color_scheme === settings_config.color_scheme_values.light.code) {
set_light_theme(); set_light_theme();
} else { } else {
// If the color_scheme_code is not valid, fallback to automatic. // If the color_scheme_code is not valid, fallback to automatic.

20
web/src/zcommand.ts
View File

@@ -64,11 +64,11 @@ export function tell_user(msg: string): void {
export function switch_to_light_theme(): void { export function switch_to_light_theme(): void {
send({ send({
command: "/day", command: "/light",
on_success(raw_data) { on_success(raw_data) {
const data = data_schema.parse(raw_data); const data = data_schema.parse(raw_data);
requestAnimationFrame(() => { requestAnimationFrame(() => {
theme.set_theme_and_update(settings_config.color_scheme_values.day.code); theme.set_theme_and_update(settings_config.color_scheme_values.light.code);
}); });
feedback_widget.show({ feedback_widget.show({
populate($container) { populate($container) {
@@ -77,7 +77,7 @@ export function switch_to_light_theme(): void {
}, },
on_undo() { on_undo() {
send({ send({
command: "/night", command: "/dark",
}); });
}, },
title_text: $t({defaultMessage: "Light theme"}), title_text: $t({defaultMessage: "Light theme"}),
@@ -89,11 +89,11 @@ export function switch_to_light_theme(): void {
export function switch_to_dark_theme(): void { export function switch_to_dark_theme(): void {
send({ send({
command: "/night", command: "/dark",
on_success(raw_data) { on_success(raw_data) {
const data = data_schema.parse(raw_data); const data = data_schema.parse(raw_data);
requestAnimationFrame(() => { requestAnimationFrame(() => {
theme.set_theme_and_update(settings_config.color_scheme_values.night.code); theme.set_theme_and_update(settings_config.color_scheme_values.dark.code);
}); });
feedback_widget.show({ feedback_widget.show({
populate($container) { populate($container) {
@@ -102,7 +102,7 @@ export function switch_to_dark_theme(): void {
}, },
on_undo() { on_undo() {
send({ send({
command: "/day", command: "/light",
}); });
}, },
title_text: $t({defaultMessage: "Dark theme"}), title_text: $t({defaultMessage: "Dark theme"}),
@@ -131,14 +131,14 @@ export function process(message_content: string): boolean {
return true; return true;
} }
const day_commands = ["/day", "/light"]; const light_commands = ["/day", "/light"];
if (day_commands.includes(content)) { if (light_commands.includes(content)) {
switch_to_light_theme(); switch_to_light_theme();
return true; return true;
} }
const night_commands = ["/night", "/dark"]; const dark_commands = ["/night", "/dark"];
if (night_commands.includes(content)) { if (dark_commands.includes(content)) {
switch_to_dark_theme(); switch_to_dark_theme();
return true; return true;
} }

4
web/templates/popovers/navbar/navbar_gear_menu_popover.hbs
View File

@@ -91,11 +91,11 @@
<label role="menuitemradio" class="tab-option-content tippy-zulip-delayed-tooltip" for="select-automatic-theme" aria-label="{{t 'Select automatic theme' }}" data-tooltip-template-id="automatic-theme-template" tabindex="0"> <label role="menuitemradio" class="tab-option-content tippy-zulip-delayed-tooltip" for="select-automatic-theme" aria-label="{{t 'Select automatic theme' }}" data-tooltip-template-id="automatic-theme-template" tabindex="0">
<i class="zulip-icon zulip-icon-monitor" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-monitor" aria-hidden="true"></i>
</label> </label>
<input type="radio" id="select-light-theme" class="tab-option" name="theme-select" data-theme-code="{{color_scheme_values.day.code}}" {{#if (eq user_color_scheme color_scheme_values.day.code)}}checked{{/if}} /> <input type="radio" id="select-light-theme" class="tab-option" name="theme-select" data-theme-code="{{color_scheme_values.light.code}}" {{#if (eq user_color_scheme color_scheme_values.light.code)}}checked{{/if}} />
<label role="menuitemradio" class="tab-option-content tippy-zulip-delayed-tooltip" for="select-light-theme" aria-label="{{t 'Select light theme' }}" data-tippy-content="{{t 'Light theme' }}" tabindex="0"> <label role="menuitemradio" class="tab-option-content tippy-zulip-delayed-tooltip" for="select-light-theme" aria-label="{{t 'Select light theme' }}" data-tippy-content="{{t 'Light theme' }}" tabindex="0">
<i class="zulip-icon zulip-icon-sun" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-sun" aria-hidden="true"></i>
</label> </label>
<input type="radio" id="select-dark-theme" class="tab-option" name="theme-select" data-theme-code="{{color_scheme_values.night.code}}" {{#if (eq user_color_scheme color_scheme_values.night.code)}}checked{{/if}} /> <input type="radio" id="select-dark-theme" class="tab-option" name="theme-select" data-theme-code="{{color_scheme_values.dark.code}}" {{#if (eq user_color_scheme color_scheme_values.dark.code)}}checked{{/if}} />
<label role="menuitemradio" class="tab-option-content tippy-zulip-delayed-tooltip" for="select-dark-theme" aria-label="{{t 'Select dark theme' }}" data-tippy-content="{{t 'Dark theme' }}" tabindex="0"> <label role="menuitemradio" class="tab-option-content tippy-zulip-delayed-tooltip" for="select-dark-theme" aria-label="{{t 'Select dark theme' }}" data-tippy-content="{{t 'Dark theme' }}" tabindex="0">
<i class="zulip-icon zulip-icon-moon" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-moon" aria-hidden="true"></i>
</label> </label>

4
web/templates/popovers/navbar/navbar_personal_menu_popover.hbs
View File

@@ -111,11 +111,11 @@
<label role="menuitemradio" class="tab-option-content tippy-zulip-delayed-tooltip" for="select-automatic-theme" aria-label="{{t 'Select automatic theme' }}" data-tooltip-template-id="automatic-theme-template" tabindex="0"> <label role="menuitemradio" class="tab-option-content tippy-zulip-delayed-tooltip" for="select-automatic-theme" aria-label="{{t 'Select automatic theme' }}" data-tooltip-template-id="automatic-theme-template" tabindex="0">
<i class="zulip-icon zulip-icon-monitor" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-monitor" aria-hidden="true"></i>
</label> </label>
<input type="radio" id="select-light-theme" class="tab-option" name="theme-select" data-theme-code="{{color_scheme_values.day.code}}" {{#if (eq user_color_scheme color_scheme_values.day.code)}}checked{{/if}} /> <input type="radio" id="select-light-theme" class="tab-option" name="theme-select" data-theme-code="{{color_scheme_values.light.code}}" {{#if (eq user_color_scheme color_scheme_values.light.code)}}checked{{/if}} />
<label role="menuitemradio" class="tab-option-content tippy-zulip-delayed-tooltip" for="select-light-theme" aria-label="{{t 'Select light theme' }}" data-tippy-content="{{t 'Light theme' }}" tabindex="0"> <label role="menuitemradio" class="tab-option-content tippy-zulip-delayed-tooltip" for="select-light-theme" aria-label="{{t 'Select light theme' }}" data-tippy-content="{{t 'Light theme' }}" tabindex="0">
<i class="zulip-icon zulip-icon-sun" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-sun" aria-hidden="true"></i>
</label> </label>
<input type="radio" id="select-dark-theme" class="tab-option" name="theme-select" data-theme-code="{{color_scheme_values.night.code}}" {{#if (eq user_color_scheme color_scheme_values.night.code)}}checked{{/if}} /> <input type="radio" id="select-dark-theme" class="tab-option" name="theme-select" data-theme-code="{{color_scheme_values.dark.code}}" {{#if (eq user_color_scheme color_scheme_values.dark.code)}}checked{{/if}} />
<label role="menuitemradio" class="tab-option-content tippy-zulip-delayed-tooltip" for="select-dark-theme" aria-label="{{t 'Select dark theme' }}" data-tippy-content="{{t 'Dark theme' }}" tabindex="0"> <label role="menuitemradio" class="tab-option-content tippy-zulip-delayed-tooltip" for="select-dark-theme" aria-label="{{t 'Select dark theme' }}" data-tippy-content="{{t 'Dark theme' }}" tabindex="0">
<i class="zulip-icon zulip-icon-moon" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-moon" aria-hidden="true"></i>
</label> </label>

4
web/tests/settings_data.test.js
View File

@@ -234,7 +234,7 @@ test_message_policy(
); );
run_test("using_dark_theme", () => { run_test("using_dark_theme", () => {
user_settings.color_scheme = settings_config.color_scheme_values.night.code; user_settings.color_scheme = settings_config.color_scheme_values.dark.code;
assert.equal(settings_data.using_dark_theme(), true); assert.equal(settings_data.using_dark_theme(), true);
user_settings.color_scheme = settings_config.color_scheme_values.automatic.code; user_settings.color_scheme = settings_config.color_scheme_values.automatic.code;
@@ -251,7 +251,7 @@ run_test("using_dark_theme", () => {
}; };
assert.equal(settings_data.using_dark_theme(), false); assert.equal(settings_data.using_dark_theme(), false);
user_settings.color_scheme = settings_config.color_scheme_values.day.code; user_settings.color_scheme = settings_config.color_scheme_values.light.code;
assert.equal(settings_data.using_dark_theme(), false); assert.equal(settings_data.using_dark_theme(), false);
}); });