Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update from main #929

Merged
merged 6 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/components/account-info.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const MUTE_DURATIONS = [
60 * 60 * 24, // 1 day
60 * 60 * 24 * 3, // 3 days
60 * 60 * 24 * 7, // 1 week
60 * 60 * 24 * 30, // 30 days
0, // forever
];
const MUTE_DURATIONS_LABELS = {
Expand All @@ -62,6 +63,7 @@ const MUTE_DURATIONS_LABELS = {
86_400: i18nDuration(1, 'day'),
259_200: i18nDuration(3, 'day'),
604_800: i18nDuration(1, 'week'),
2592_000: i18nDuration(30, 'day'),
};

const LIMIT = 80;
Expand Down
12 changes: 12 additions & 0 deletions src/components/columns.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,18 @@ function Columns() {
states.showShortcutsSettings = true;
}
}}
onFocus={() => {
// Get current focused column
const currentFocusedColumn =
document.activeElement.closest('#columns > *');
if (currentFocusedColumn) {
// Remove focus classes from all columns
// Add focus class to current focused column
document.querySelectorAll('#columns > *').forEach((column) => {
column.classList.toggle('focus', column === currentFocusedColumn);
});
}
}}
>
{components}
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/media-modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ function MediaModal({
default: oklch2rgb([0.6, okColor[1], okColor[2]]),
};
}
return {};
return null;
});
});
const mediaAccentGradients = useMemo(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/data/catalogs.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"code": "th-TH",
"nativeName": "ไทย",
"name": "Thai",
"completion": 3
"completion": 5
},
{
"code": "uk-UA",
Expand Down
Loading