diff --git a/packages/app/src/git/commits-section/commits-section.tsx b/packages/app/src/git/commits-section/commits-section.tsx index 207e8da70..97107cfb8 100644 --- a/packages/app/src/git/commits-section/commits-section.tsx +++ b/packages/app/src/git/commits-section/commits-section.tsx @@ -7,7 +7,6 @@ import { useChangesPreferences } from "@/hooks/use-changes-preferences"; import { useCheckoutCommitsQuery, type CheckoutCommitsQueryResult } from "@/git/use-commits-query"; import { ThemedChevron, chevronColorMapping } from "@/git/themed-chevron"; import { CommitRow } from "./commit-row"; -import { dotStyles } from "./shared"; interface CommitsSectionProps { serverId: string; @@ -137,12 +136,6 @@ export function CommitsSection({ serverId, cwd, onCommitPress }: CommitsSectionP {commitCount} )} - - - {t("workspace.git.diff.commits.legendLocal")} - - {t("workspace.git.diff.commits.legendRemote")} - {collapsed ? null : ( @@ -177,7 +170,6 @@ const styles = StyleSheet.create((theme) => ({ }, title: { fontSize: theme.fontSize.sm, - fontWeight: theme.fontWeight.medium, color: theme.colors.foreground, }, count: { @@ -188,16 +180,6 @@ const styles = StyleSheet.create((theme) => ({ countSpacer: { flex: 1, }, - legend: { - flexDirection: "row", - alignItems: "center", - gap: theme.spacing[1], - flexShrink: 0, - }, - legendText: { - fontSize: theme.fontSize.xs, - color: theme.colors.foregroundMuted, - }, list: { paddingBottom: theme.spacing[1], }, diff --git a/packages/app/src/git/commits-section/shared.ts b/packages/app/src/git/commits-section/shared.ts index 11e7b3811..e193cefbc 100644 --- a/packages/app/src/git/commits-section/shared.ts +++ b/packages/app/src/git/commits-section/shared.ts @@ -13,11 +13,8 @@ export const DOT_SIZE = 8; const REMOTE_DOT_OPACITY = 0.55; /** - * Shared local/remote commit dot styles used by both the commit rows and the - * section legend so the two never drift. - * - * Semantics: a local-only commit is a hollow ring; a commit that has reached - * the remote is a subtle (dimmed) filled green dot. + * A local-only commit is a hollow ring; a commit that has reached the remote + * is a subtle (dimmed) filled green dot. */ export const dotStyles = StyleSheet.create((theme) => ({ dotLocal: { @@ -37,15 +34,4 @@ export const dotStyles = StyleSheet.create((theme) => ({ opacity: REMOTE_DOT_OPACITY, flexShrink: 0, }, - // Legend variant of the remote dot: same fill, with leading spacing so it - // separates from the preceding "local" label in the section header legend. - legendDotRemote: { - width: DOT_SIZE, - height: DOT_SIZE, - borderRadius: theme.borderRadius.full, - backgroundColor: theme.colors.statusSuccess, - opacity: REMOTE_DOT_OPACITY, - flexShrink: 0, - marginLeft: theme.spacing[1], - }, })); diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts index a46d3861f..bcb3436bf 100644 --- a/packages/app/src/i18n/resources/ar.ts +++ b/packages/app/src/i18n/resources/ar.ts @@ -788,8 +788,6 @@ export const ar: TranslationResources = { deletedFile: "تم الحذف", commits: { title: "الإيداعات", - legendLocal: "محلي", - legendRemote: "على المستودع البعيد", countLabel: "{{count}} إيداعات قبل الأساس", fileDiffEmpty: "لا توجد تغييرات لعرضها", fileDiffError: "تعذّر تحميل فروق الملف", diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts index 1518531c5..f52ab3b73 100644 --- a/packages/app/src/i18n/resources/en.ts +++ b/packages/app/src/i18n/resources/en.ts @@ -798,8 +798,6 @@ export const en = { deletedFile: "Deleted", commits: { title: "Commits", - legendLocal: "local", - legendRemote: "on remote", countLabel: "{{count}} commits ahead of base", fileDiffEmpty: "No changes to display", fileDiffError: "Failed to load file diff", diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts index e433b4e0e..dcb0bc4d1 100644 --- a/packages/app/src/i18n/resources/es.ts +++ b/packages/app/src/i18n/resources/es.ts @@ -819,8 +819,6 @@ export const es: TranslationResources = { deletedFile: "Eliminado", commits: { title: "Commits", - legendLocal: "local", - legendRemote: "en remoto", countLabel: "{{count}} commits por delante de la base", fileDiffEmpty: "No hay cambios para mostrar", fileDiffError: "Error al cargar el diff del archivo", diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts index 8cf561f67..0ece48dbe 100644 --- a/packages/app/src/i18n/resources/fr.ts +++ b/packages/app/src/i18n/resources/fr.ts @@ -818,8 +818,6 @@ export const fr: TranslationResources = { deletedFile: "Supprimé", commits: { title: "Commits", - legendLocal: "local", - legendRemote: "sur le distant", countLabel: "{{count}} commits en avance sur la base", fileDiffEmpty: "Aucune modification à afficher", fileDiffError: "Échec du chargement du diff du fichier", diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts index 651199194..48721fdea 100644 --- a/packages/app/src/i18n/resources/ja.ts +++ b/packages/app/src/i18n/resources/ja.ts @@ -799,8 +799,6 @@ export const ja: TranslationResources = { deletedFile: "削除済み", commits: { title: "コミット", - legendLocal: "ローカル", - legendRemote: "リモート", countLabel: "ベースより先のコミット数: {{count}}", fileDiffEmpty: "表示する変更はありません", fileDiffError: "ファイル差分の読み込みに失敗しました", diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts index 01a6eb324..e7e9b34dd 100644 --- a/packages/app/src/i18n/resources/pt-BR.ts +++ b/packages/app/src/i18n/resources/pt-BR.ts @@ -810,8 +810,6 @@ export const ptBR: TranslationResources = { deletedFile: "Excluído", commits: { title: "Commits", - legendLocal: "local", - legendRemote: "no remoto", countLabel: "{{count}} commits à frente da base", fileDiffEmpty: "Nenhuma alteração para exibir", fileDiffError: "Falha ao carregar diff do arquivo", diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts index 08db24c1a..7cb510dc6 100644 --- a/packages/app/src/i18n/resources/ru.ts +++ b/packages/app/src/i18n/resources/ru.ts @@ -810,8 +810,6 @@ export const ru: TranslationResources = { deletedFile: "Удалено", commits: { title: "Коммиты", - legendLocal: "локально", - legendRemote: "на удалённом", countLabel: "{{count}} коммитов впереди базы", fileDiffEmpty: "Нет изменений для отображения", fileDiffError: "Не удалось загрузить различия файла", diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts index 1b52b0333..44811021f 100644 --- a/packages/app/src/i18n/resources/zh-CN.ts +++ b/packages/app/src/i18n/resources/zh-CN.ts @@ -780,8 +780,6 @@ export const zhCN: TranslationResources = { deletedFile: "已删除", commits: { title: "提交", - legendLocal: "本地", - legendRemote: "已推送", countLabel: "领先基线 {{count}} 个提交", fileDiffEmpty: "没有可显示的更改", fileDiffError: "加载文件差异失败",